@internxt/cli 1.5.2 → 1.5.4

package/dist/commands/logout.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@oclif/core");
 const config_service_1 = require("../services/config.service");
 const cli_utils_1 = require("../utils/cli.utils");
-const errors_utils_1 = require("../utils/errors.utils");
+const auth_service_1 = require("../services/auth.service");
 class Logout extends core_1.Command {
     static args = {};
     static description = 'Logs out the current internxt user that is logged into the Internxt CLI.';
@@ -14,6 +14,7 @@ class Logout extends core_1.Command {
     run = async () => {
         const user = await config_service_1.ConfigService.instance.readUser();
         if (user) {
+            await auth_service_1.AuthService.instance.logout();
             await config_service_1.ConfigService.instance.clearUser();
             const message = 'User logged out successfully.';
             cli_utils_1.CLIUtils.success(this.log.bind(this), message);
@@ -26,8 +27,14 @@ class Logout extends core_1.Command {
         }
     };
     catch = async (error) => {
-        errors_utils_1.ErrorUtils.report(this.error.bind(this), error, { command: this.id });
-        cli_utils_1.CLIUtils.error(this.log.bind(this), error.message);
+        const { flags } = await this.parse(Logout);
+        cli_utils_1.CLIUtils.catchError({
+            error,
+            command: this.id,
+            logReporter: this.log.bind(this),
+            errorReporter: this.error.bind(this),
+            jsonFlag: flags['json'],
+        });
         this.exit(1);
     };
 }

package/dist/commands/logs.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@oclif/core");
 const config_service_1 = require("../services/config.service");
 const cli_utils_1 = require("../utils/cli.utils");
-const errors_utils_1 = require("../utils/errors.utils");
 class Logs extends core_1.Command {
     static args = {};
     static description = 'Displays the Internxt CLI logs directory path';
@@ -17,8 +16,14 @@ class Logs extends core_1.Command {
         return { success: true, message, path: config_service_1.ConfigService.INTERNXT_CLI_LOGS_DIR };
     };
     catch = async (error) => {
-        errors_utils_1.ErrorUtils.report(this.error.bind(this), error, { command: this.id });
-        cli_utils_1.CLIUtils.error(this.log.bind(this), error.message);
+        const { flags } = await this.parse(Logs);
+        cli_utils_1.CLIUtils.catchError({
+            error,
+            command: this.id,
+            logReporter: this.log.bind(this),
+            errorReporter: this.error.bind(this),
+            jsonFlag: flags['json'],
+        });
         this.exit(1);
     };
 }

package/dist/commands/move-file.js

@@ -6,7 +6,6 @@ const cli_utils_1 = require("../utils/cli.utils");
 const command_types_1 = require("../types/command.types");
 const validation_service_1 = require("../services/validation.service");
 const drive_file_service_1 = require("../services/drive/drive-file.service");
-const errors_utils_1 = require("../utils/errors.utils");
 class MoveFile extends core_1.Command {
     static args = {};
     static description = 'Move a file into a destination folder.';
@@ -44,8 +43,14 @@ class MoveFile extends core_1.Command {
         return { success: true, message, file: newFile };
     };
     catch = async (error) => {
-        errors_utils_1.ErrorUtils.report(this.error.bind(this), error, { command: this.id });
-        cli_utils_1.CLIUtils.error(this.log.bind(this), error.message);
+        const { flags } = await this.parse(MoveFile);
+        cli_utils_1.CLIUtils.catchError({
+            error,
+            command: this.id,
+            logReporter: this.log.bind(this),
+            errorReporter: this.error.bind(this),
+            jsonFlag: flags['json'],
+        });
         this.exit(1);
     };
     getFileUuid = async (fileUuidFlag, nonInteractive) => {

package/dist/commands/move-folder.js

@@ -6,7 +6,6 @@ const drive_folder_service_1 = require("../services/drive/drive-folder.service")
 const cli_utils_1 = require("../utils/cli.utils");
 const command_types_1 = require("../types/command.types");
 const validation_service_1 = require("../services/validation.service");
-const errors_utils_1 = require("../utils/errors.utils");
 class MoveFolder extends core_1.Command {
     static args = {};
     static description = 'Move a folder into a destination folder.';
@@ -44,8 +43,14 @@ class MoveFolder extends core_1.Command {
         return { success: true, message, folder: newFolder };
     };
     catch = async (error) => {
-        errors_utils_1.ErrorUtils.report(this.error.bind(this), error, { command: this.id });
-        cli_utils_1.CLIUtils.error(this.log.bind(this), error.message);
+        const { flags } = await this.parse(MoveFolder);
+        cli_utils_1.CLIUtils.catchError({
+            error,
+            command: this.id,
+            logReporter: this.log.bind(this),
+            errorReporter: this.error.bind(this),
+            jsonFlag: flags['json'],
+        });
         this.exit(1);
     };
     getFolderUuid = async (folderUuidFlag, nonInteractive) => {

package/dist/commands/rename-file.js

@@ -6,7 +6,6 @@ const cli_utils_1 = require("../utils/cli.utils");
 const command_types_1 = require("../types/command.types");
 const validation_service_1 = require("../services/validation.service");
 const drive_file_service_1 = require("../services/drive/drive-file.service");
-const errors_utils_1 = require("../utils/errors.utils");
 class RenameFile extends core_1.Command {
     static args = {};
     static description = 'Rename a file.';
@@ -40,8 +39,14 @@ class RenameFile extends core_1.Command {
         return { success: true, message, file: { uuid: fileUuid, plainName: newName } };
     };
     catch = async (error) => {
-        errors_utils_1.ErrorUtils.report(this.error.bind(this), error, { command: this.id });
-        cli_utils_1.CLIUtils.error(this.log.bind(this), error.message);
+        const { flags } = await this.parse(RenameFile);
+        cli_utils_1.CLIUtils.catchError({
+            error,
+            command: this.id,
+            logReporter: this.log.bind(this),
+            errorReporter: this.error.bind(this),
+            jsonFlag: flags['json'],
+        });
         this.exit(1);
     };
     getFileUuid = async (fileUuidFlag, nonInteractive) => {

package/dist/commands/rename-folder.js

@@ -6,7 +6,6 @@ const cli_utils_1 = require("../utils/cli.utils");
 const command_types_1 = require("../types/command.types");
 const validation_service_1 = require("../services/validation.service");
 const drive_folder_service_1 = require("../services/drive/drive-folder.service");
-const errors_utils_1 = require("../utils/errors.utils");
 class RenameFolder extends core_1.Command {
     static args = {};
     static description = 'Rename a folder.';
@@ -40,8 +39,14 @@ class RenameFolder extends core_1.Command {
         return { success: true, message, folder: { uuid: folderUuid, plainName: name } };
     };
     catch = async (error) => {
-        errors_utils_1.ErrorUtils.report(this.error.bind(this), error, { command: this.id });
-        cli_utils_1.CLIUtils.error(this.log.bind(this), error.message);
+        const { flags } = await this.parse(RenameFolder);
+        cli_utils_1.CLIUtils.catchError({
+            error,
+            command: this.id,
+            logReporter: this.log.bind(this),
+            errorReporter: this.error.bind(this),
+            jsonFlag: flags['json'],
+        });
         this.exit(1);
     };
     getFolderUuid = async (folderUuidFlag, nonInteractive) => {

package/dist/commands/trash-clear.js

@@ -4,7 +4,6 @@ const core_1 = require("@oclif/core");
 const config_service_1 = require("../services/config.service");
 const cli_utils_1 = require("../utils/cli.utils");
 const command_types_1 = require("../types/command.types");
-const errors_utils_1 = require("../utils/errors.utils");
 const trash_service_1 = require("../services/drive/trash.service");
 const inquirer_utils_1 = require("../utils/inquirer.utils");
 class TrashClear extends core_1.Command {
@@ -45,8 +44,14 @@ class TrashClear extends core_1.Command {
         return { success: true, message };
     };
     catch = async (error) => {
-        errors_utils_1.ErrorUtils.report(this.error.bind(this), error, { command: this.id });
-        cli_utils_1.CLIUtils.error(this.log.bind(this), error.message);
+        const { flags } = await this.parse(TrashClear);
+        cli_utils_1.CLIUtils.catchError({
+            error,
+            command: this.id,
+            logReporter: this.log.bind(this),
+            errorReporter: this.error.bind(this),
+            jsonFlag: flags['json'],
+        });
         this.exit(1);
     };
     getConfirmation = async () => {

package/dist/commands/trash-file.js

@@ -5,7 +5,6 @@ const config_service_1 = require("../services/config.service");
 const cli_utils_1 = require("../utils/cli.utils");
 const command_types_1 = require("../types/command.types");
 const validation_service_1 = require("../services/validation.service");
-const errors_utils_1 = require("../utils/errors.utils");
 const trash_service_1 = require("../services/drive/trash.service");
 class TrashFile extends core_1.Command {
     static args = {};
@@ -34,8 +33,14 @@ class TrashFile extends core_1.Command {
         return { success: true, message, file: { uuid } };
     };
     catch = async (error) => {
-        errors_utils_1.ErrorUtils.report(this.error.bind(this), error, { command: this.id });
-        cli_utils_1.CLIUtils.error(this.log.bind(this), error.message);
+        const { flags } = await this.parse(TrashFile);
+        cli_utils_1.CLIUtils.catchError({
+            error,
+            command: this.id,
+            logReporter: this.log.bind(this),
+            errorReporter: this.error.bind(this),
+            jsonFlag: flags['json'],
+        });
         this.exit(1);
     };
     getFileUuid = async (fileUuidFlag, nonInteractive) => {

package/dist/commands/trash-folder.js

@@ -5,7 +5,6 @@ const config_service_1 = require("../services/config.service");
 const cli_utils_1 = require("../utils/cli.utils");
 const command_types_1 = require("../types/command.types");
 const validation_service_1 = require("../services/validation.service");
-const errors_utils_1 = require("../utils/errors.utils");
 const trash_service_1 = require("../services/drive/trash.service");
 class TrashFolder extends core_1.Command {
     static args = {};
@@ -34,8 +33,14 @@ class TrashFolder extends core_1.Command {
         return { success: true, message, folder: { uuid } };
     };
     catch = async (error) => {
-        errors_utils_1.ErrorUtils.report(this.error.bind(this), error, { command: this.id });
-        cli_utils_1.CLIUtils.error(this.log.bind(this), error.message);
+        const { flags } = await this.parse(TrashFolder);
+        cli_utils_1.CLIUtils.catchError({
+            error,
+            command: this.id,
+            logReporter: this.log.bind(this),
+            errorReporter: this.error.bind(this),
+            jsonFlag: flags['json'],
+        });
         this.exit(1);
     };
     getFolderUuid = async (folderUuidFlag, nonInteractive) => {

package/dist/commands/trash-list.js

@@ -5,7 +5,6 @@ const config_service_1 = require("../services/config.service");
 const cli_utils_1 = require("../utils/cli.utils");
 const command_types_1 = require("../types/command.types");
 const format_utils_1 = require("../utils/format.utils");
-const errors_utils_1 = require("../utils/errors.utils");
 const trash_service_1 = require("../services/drive/trash.service");
 class TrashList extends core_1.Command {
     static args = {};
@@ -58,8 +57,14 @@ class TrashList extends core_1.Command {
         return { success: true, list: { folders, files } };
     };
     catch = async (error) => {
-        errors_utils_1.ErrorUtils.report(this.error.bind(this), error, { command: this.id });
-        cli_utils_1.CLIUtils.error(this.log.bind(this), error.message);
+        const { flags } = await this.parse(TrashList);
+        cli_utils_1.CLIUtils.catchError({
+            error,
+            command: this.id,
+            logReporter: this.log.bind(this),
+            errorReporter: this.error.bind(this),
+            jsonFlag: flags['json'],
+        });
         this.exit(1);
     };
 }

package/dist/commands/trash-restore-file.js

@@ -6,7 +6,6 @@ const cli_utils_1 = require("../utils/cli.utils");
 const command_types_1 = require("../types/command.types");
 const validation_service_1 = require("../services/validation.service");
 const drive_file_service_1 = require("../services/drive/drive-file.service");
-const errors_utils_1 = require("../utils/errors.utils");
 class TrashRestoreFile extends core_1.Command {
     static args = {};
     static description = 'Restore a trashed file into a destination folder.';
@@ -44,8 +43,14 @@ class TrashRestoreFile extends core_1.Command {
         return { success: true, message, file };
     };
     catch = async (error) => {
-        errors_utils_1.ErrorUtils.report(this.error.bind(this), error, { command: this.id });
-        cli_utils_1.CLIUtils.error(this.log.bind(this), error.message);
+        const { flags } = await this.parse(TrashRestoreFile);
+        cli_utils_1.CLIUtils.catchError({
+            error,
+            command: this.id,
+            logReporter: this.log.bind(this),
+            errorReporter: this.error.bind(this),
+            jsonFlag: flags['json'],
+        });
         this.exit(1);
     };
     getFileUuid = async (fileUuidFlag, nonInteractive) => {

package/dist/commands/trash-restore-folder.js

@@ -6,7 +6,6 @@ const drive_folder_service_1 = require("../services/drive/drive-folder.service")
 const cli_utils_1 = require("../utils/cli.utils");
 const command_types_1 = require("../types/command.types");
 const validation_service_1 = require("../services/validation.service");
-const errors_utils_1 = require("../utils/errors.utils");
 class TrashRestoreFolder extends core_1.Command {
     static args = {};
     static description = 'Restore a trashed folder into a destination folder.';
@@ -44,8 +43,14 @@ class TrashRestoreFolder extends core_1.Command {
         return { success: true, message, folder };
     };
     catch = async (error) => {
-        errors_utils_1.ErrorUtils.report(this.error.bind(this), error, { command: this.id });
-        cli_utils_1.CLIUtils.error(this.log.bind(this), error.message);
+        const { flags } = await this.parse(TrashRestoreFolder);
+        cli_utils_1.CLIUtils.catchError({
+            error,
+            command: this.id,
+            logReporter: this.log.bind(this),
+            errorReporter: this.error.bind(this),
+            jsonFlag: flags['json'],
+        });
         this.exit(1);
     };
     getFolderUuid = async (folderUuidFlag, nonInteractive) => {

package/dist/commands/upload-file.js

@@ -60,7 +60,7 @@ class UploadFile extends core_1.Command {
         if (destinationFolderUuid.trim().length === 0) {
             destinationFolderUuid = userCredentials.user.rootFolderId;
         }
-        cli_utils_1.CLIUtils.doing('Preparing Network');
+        cli_utils_1.CLIUtils.doing('Preparing Network', flags['json']);
         const { user } = await auth_service_1.AuthService.instance.getAuthDetails();
         const networkModule = sdk_manager_service_1.SdkManager.instance.getNetwork({
             user: user.bridgeUser,
@@ -73,14 +73,14 @@ class UploadFile extends core_1.Command {
             encryptionKey: user.mnemonic,
         });
         const networkFacade = new network_facade_service_1.NetworkFacade(networkModule, environment, download_service_1.DownloadService.instance, crypto_service_1.CryptoService.instance);
-        cli_utils_1.CLIUtils.done();
+        cli_utils_1.CLIUtils.done(flags['json']);
         const readStream = (0, node_fs_1.createReadStream)(filePath);
         const timer = cli_utils_1.CLIUtils.timer();
         const progressBar = cli_utils_1.CLIUtils.progress({
             format: 'Uploading file [{bar}] {percentage}%',
             linewrap: true,
-        });
-        progressBar.start(100, 0);
+        }, flags['json']);
+        progressBar?.start(100, 0);
         let bufferStream;
         let fileStream = readStream;
         const isThumbnailable = (0, thumbnail_utils_1.isFileThumbnailable)(fileType);
@@ -89,7 +89,7 @@ class UploadFile extends core_1.Command {
             fileStream = readStream.pipe(bufferStream);
         }
         const progressCallback = (progress) => {
-            progressBar.update(progress * 100 * 0.99);
+            progressBar?.update(progress * 100 * 0.99);
         };
         const fileId = await new Promise((resolve, reject) => {
             const state = networkFacade.uploadFile(fileStream, stats.size, user.bucket, (err, res) => {
@@ -117,24 +117,30 @@ class UploadFile extends core_1.Command {
             if (isThumbnailable && bufferStream) {
                 const thumbnailBuffer = bufferStream.getBuffer();
                 if (thumbnailBuffer) {
-                    await thumbnail_service_1.ThumbnailService.instance.uploadThumbnail(thumbnailBuffer, fileType, user.bucket, createdDriveFile.id, networkFacade);
+                    await thumbnail_service_1.ThumbnailService.instance.uploadThumbnail(thumbnailBuffer, fileType, user.bucket, createdDriveFile.uuid, networkFacade);
                 }
             }
         }
         catch (error) {
             errors_utils_1.ErrorUtils.report(this.error.bind(this), error, { command: this.id });
         }
-        progressBar.update(100);
-        progressBar.stop();
+        progressBar?.update(100);
+        progressBar?.stop();
         const uploadTime = timer.stop();
         this.log('\n');
-        const message = `File uploaded in ${uploadTime}ms, view it at ${config_service_1.ConfigService.instance.get('DRIVE_URL')}/file/${createdDriveFile.uuid}`;
+        const message = `File uploaded in ${uploadTime}ms, view it at ${config_service_1.ConfigService.instance.get('DRIVE_WEB_URL')}/file/${createdDriveFile.uuid}`;
         cli_utils_1.CLIUtils.success(this.log.bind(this), message);
         return { success: true, message, file: createdDriveFile };
     };
     catch = async (error) => {
-        errors_utils_1.ErrorUtils.report(this.error.bind(this), error, { command: this.id });
-        cli_utils_1.CLIUtils.error(this.log.bind(this), error.message);
+        const { flags } = await this.parse(UploadFile);
+        cli_utils_1.CLIUtils.catchError({
+            error,
+            command: this.id,
+            logReporter: this.log.bind(this),
+            errorReporter: this.error.bind(this),
+            jsonFlag: flags['json'],
+        });
         this.exit(1);
     };
     getDestinationFolderUuid = async (destinationFolderUuidFlag, nonInteractive) => {

package/dist/commands/webdav-config.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@oclif/core");
 const config_service_1 = require("../services/config.service");
 const cli_utils_1 = require("../utils/cli.utils");
-const errors_utils_1 = require("../utils/errors.utils");
 const command_types_1 = require("../types/command.types");
 const validation_service_1 = require("../services/validation.service");
 class WebDAVConfig extends core_1.Command {
@@ -67,8 +66,14 @@ class WebDAVConfig extends core_1.Command {
         return { success: true, message, config: webdavConfig };
     };
     catch = async (error) => {
-        errors_utils_1.ErrorUtils.report(this.error.bind(this), error, { command: this.id });
-        cli_utils_1.CLIUtils.error(this.log.bind(this), error.message);
+        const { flags } = await this.parse(WebDAVConfig);
+        cli_utils_1.CLIUtils.catchError({
+            error,
+            command: this.id,
+            logReporter: this.log.bind(this),
+            errorReporter: this.error.bind(this),
+            jsonFlag: flags['json'],
+        });
         this.exit(1);
     };
 }

package/dist/commands/webdav.js

@@ -4,7 +4,6 @@ const core_1 = require("@oclif/core");
 const pm2_utils_1 = require("../utils/pm2.utils");
 const cli_utils_1 = require("../utils/cli.utils");
 const config_service_1 = require("../services/config.service");
-const errors_utils_1 = require("../utils/errors.utils");
 const auth_service_1 = require("../services/auth.service");
 class Webdav extends core_1.Command {
     static args = {
@@ -24,23 +23,23 @@ class Webdav extends core_1.Command {
     static flags = {};
     static enableJsonFlag = true;
     run = async () => {
-        const { args } = await this.parse(Webdav);
+        const { args, flags } = await this.parse(Webdav);
         let message = '';
         let success = true;
         await pm2_utils_1.PM2Utils.connect();
         switch (args.action) {
             case 'enable': {
                 await auth_service_1.AuthService.instance.getAuthDetails();
-                message = await this.enableWebDav();
+                message = await this.enableWebDav(flags['json']);
                 break;
             }
             case 'disable': {
-                message = await this.disableWebDav();
+                message = await this.disableWebDav(flags['json']);
                 break;
             }
             case 'restart': {
                 await auth_service_1.AuthService.instance.getAuthDetails();
-                message = await this.restartWebDav();
+                message = await this.restartWebDav(flags['json']);
                 break;
             }
             case 'status': {
@@ -58,20 +57,21 @@ class Webdav extends core_1.Command {
         return { success, message, action: args.action };
     };
     catch = async (error) => {
-        errors_utils_1.ErrorUtils.report(this.error.bind(this), error, { command: this.id });
-        if (error instanceof Error) {
-            cli_utils_1.CLIUtils.error(this.log.bind(this), error.message);
-        }
-        else {
-            cli_utils_1.CLIUtils.error(this.log.bind(this), JSON.stringify(error));
-        }
+        const { flags } = await this.parse(Webdav);
+        cli_utils_1.CLIUtils.catchError({
+            error,
+            command: this.id,
+            logReporter: this.log.bind(this),
+            errorReporter: this.error.bind(this),
+            jsonFlag: flags['json'],
+        });
         this.exit(1);
     };
-    enableWebDav = async () => {
-        cli_utils_1.CLIUtils.doing('Starting Internxt WebDav server...');
+    enableWebDav = async (jsonFlag) => {
+        cli_utils_1.CLIUtils.doing('Starting Internxt WebDav server...', jsonFlag);
         await pm2_utils_1.PM2Utils.killWebDavServer();
         await pm2_utils_1.PM2Utils.startWebDavServer();
-        cli_utils_1.CLIUtils.done();
+        cli_utils_1.CLIUtils.done(jsonFlag);
         const { status } = await pm2_utils_1.PM2Utils.webdavServerStatus();
         const webdavConfigs = await config_service_1.ConfigService.instance.readWebdavConfig();
         if (status === 'online') {
@@ -87,27 +87,27 @@ class Webdav extends core_1.Command {
             return message;
         }
     };
-    disableWebDav = async () => {
-        cli_utils_1.CLIUtils.doing('Stopping Internxt WebDav server...');
+    disableWebDav = async (jsonFlag) => {
+        cli_utils_1.CLIUtils.doing('Stopping Internxt WebDav server...', jsonFlag);
         await pm2_utils_1.PM2Utils.killWebDavServer();
-        cli_utils_1.CLIUtils.done();
+        cli_utils_1.CLIUtils.done(jsonFlag);
         const message = 'Internxt WebDav server stopped successfully';
         cli_utils_1.CLIUtils.success(this.log.bind(this), message);
         return message;
     };
-    restartWebDav = async () => {
-        cli_utils_1.CLIUtils.doing('Restarting Internxt WebDav server...');
+    restartWebDav = async (jsonFlag) => {
+        cli_utils_1.CLIUtils.doing('Restarting Internxt WebDav server...', jsonFlag);
         const { status } = await pm2_utils_1.PM2Utils.webdavServerStatus();
         if (status === 'online') {
             await pm2_utils_1.PM2Utils.killWebDavServer();
             await pm2_utils_1.PM2Utils.startWebDavServer();
-            cli_utils_1.CLIUtils.done();
+            cli_utils_1.CLIUtils.done(jsonFlag);
             const message = 'Internxt WebDav server restarted successfully';
             cli_utils_1.CLIUtils.success(this.log.bind(this), message);
             return message;
         }
         else {
-            cli_utils_1.CLIUtils.done();
+            cli_utils_1.CLIUtils.done(jsonFlag);
             const message = 'Internxt WebDav server is not running, it wont be restarted';
             cli_utils_1.CLIUtils.warning(this.log.bind(this), message);
             return message;

package/dist/commands/whoami.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@oclif/core");
 const cli_utils_1 = require("../utils/cli.utils");
-const errors_utils_1 = require("../utils/errors.utils");
 const config_service_1 = require("../services/config.service");
 const validation_service_1 = require("../services/validation.service");
 class Whoami extends core_1.Command {
@@ -35,8 +34,14 @@ class Whoami extends core_1.Command {
         }
     };
     catch = async (error) => {
-        errors_utils_1.ErrorUtils.report(this.error.bind(this), error, { command: this.id });
-        cli_utils_1.CLIUtils.error(this.log.bind(this), error.message);
+        const { flags } = await this.parse(Whoami);
+        cli_utils_1.CLIUtils.catchError({
+            error,
+            command: this.id,
+            logReporter: this.log.bind(this),
+            errorReporter: this.error.bind(this),
+            jsonFlag: flags['json'],
+        });
         this.exit(1);
     };
     checkUserAndTokens = (loginCreds) => {

package/dist/hooks/prerun/auth_check.js

@@ -14,22 +14,28 @@ const webdav_1 = __importDefault(require("../../commands/webdav"));
 const webdav_config_1 = __importDefault(require("../../commands/webdav-config"));
 const CommandsToSkip = [whoami_1.default, login_1.default, logout_1.default, logs_1.default, webdav_1.default, webdav_config_1.default];
 const hook = async function (opts) {
-    if (!CommandsToSkip.map((command) => command.name).includes(opts.Command.name)) {
-        cli_utils_1.CLIUtils.doing('Checking credentials');
+    const { Command, argv } = opts;
+    const jsonFlag = argv.includes('--json');
+    if (!CommandsToSkip.map((command) => command.name).includes(Command.name)) {
+        cli_utils_1.CLIUtils.doing('Checking credentials', jsonFlag);
         try {
             const { token, newToken } = await auth_service_1.AuthService.instance.getAuthDetails();
             sdk_manager_service_1.SdkManager.init({
                 token,
                 newToken,
             });
-            cli_utils_1.CLIUtils.done();
-            cli_utils_1.CLIUtils.clearPreviousLine();
+            cli_utils_1.CLIUtils.done(jsonFlag);
+            cli_utils_1.CLIUtils.clearPreviousLine(jsonFlag);
         }
         catch (error) {
             const err = error;
-            cli_utils_1.CLIUtils.done();
-            cli_utils_1.CLIUtils.clearPreviousLine();
-            cli_utils_1.CLIUtils.error(this.log.bind(this), err.message);
+            cli_utils_1.CLIUtils.catchError({
+                error: err,
+                command: Command.id,
+                logReporter: this.log.bind(this),
+                errorReporter: this.error.bind(this),
+                jsonFlag,
+            });
             opts.context.exit(1);
         }
     }

package/dist/services/auth.service.d.ts

@@ -5,4 +5,5 @@ export declare class AuthService {
     is2FANeeded: (email: string) => Promise<boolean>;
     getAuthDetails: () => Promise<LoginCredentials>;
     refreshUserTokens: (oldCreds: LoginCredentials) => Promise<LoginCredentials>;
+    logout: () => Promise<void>;
 }

package/dist/services/auth.service.js

@@ -73,7 +73,7 @@ class AuthService {
             token: oldCreds.token,
             newToken: oldCreds.newToken,
         });
-        const usersClient = sdk_manager_service_1.SdkManager.instance.getUsers(true);
+        const usersClient = sdk_manager_service_1.SdkManager.instance.getUsers();
         const newCreds = await usersClient.getUserData({ userUuid: oldCreds.user.uuid });
         const loginCreds = {
             user: {
@@ -92,5 +92,17 @@ class AuthService {
         });
         return loginCreds;
     };
+    logout = async () => {
+        try {
+            const user = await config_service_1.ConfigService.instance.readUser();
+            if (!user || !user.newToken) {
+                return;
+            }
+            const authClient = sdk_manager_service_1.SdkManager.instance.getAuth();
+            return authClient.logout(user.newToken);
+        }
+        catch {
+        }
+    };
 }
 exports.AuthService = AuthService;

package/dist/services/crypto.service.d.ts

@@ -14,5 +14,5 @@ export declare class CryptoService {
     encryptTextWithKey: (textToEncrypt: string, secret: string) => string;
     decryptTextWithKey: (encryptedText: string, secret: string) => string;
     decryptStream: (inputSlices: ReadableStream<Uint8Array>[], key: Buffer, iv: Buffer, startOffsetByte?: number) => ReadableStream<any>;
-    private getKeyAndIvFrom;
+    private readonly getKeyAndIvFrom;
 }

package/dist/services/crypto.service.js

@@ -8,7 +8,7 @@ const stream_utils_1 = require("../utils/stream.utils");
 class CryptoService {
     static instance = new CryptoService();
     static cryptoProvider = {
-        async encryptPasswordHash(password, encryptedSalt) {
+        encryptPasswordHash(password, encryptedSalt) {
             const salt = CryptoService.instance.decryptText(encryptedSalt);
             const hashObj = CryptoService.instance.passToHash({ password, salt });
             return CryptoService.instance.encryptText(hashObj.hash);
@@ -32,7 +32,7 @@ class CryptoService {
         },
     };
     passToHash = (passObject) => {
-        const salt = passObject.salt ? passObject.salt : (0, node_crypto_1.randomBytes)(128 / 8).toString('hex');
+        const salt = passObject.salt ?? (0, node_crypto_1.randomBytes)(128 / 8).toString('hex');
         const hash = (0, node_crypto_1.pbkdf2Sync)(passObject.password, Buffer.from(salt, 'hex'), 10000, 256 / 8, 'sha1').toString('hex');
         const hashedObjetc = {
             salt,