[PB-5709]: feat/add-b2b-workspaces

package.json

@@ -36,6 +36,7 @@
     "/oclif.manifest.json"
   ],
   "dependencies": {
+    "@dashlane/pqc-kem-kyber512-node": "1.0.0",
     "@inquirer/prompts": "8.2.0",
     "@internxt/inxt-js": "2.2.9",
     "@internxt/lib": "1.4.1",
@@ -51,6 +52,7 @@
     "express": "5.2.1",
     "express-async-handler": "1.2.0",
     "fast-xml-parser": "5.3.3",
+    "hash-wasm": "4.12.0",
     "mime-types": "3.0.2",
     "open": "11.0.0",
     "openpgp": "6.3.0",

src/commands/add-cert.ts

@@ -8,7 +8,7 @@ import { WEBDAV_SSL_CERTS_DIR } from '../constants/configs';
 export default class AddCert extends Command {
   static readonly args = {};
   static readonly description = 'Add a self-signed certificate to the trusted store for macOS, Linux, and Windows.';
-  static readonly aliases = [];
+  static readonly aliases = ['add:cert'];
   static readonly examples = ['<%= config.bin %> <%= command.id %>'];
   static readonly flags = {};
   static readonly enableJsonFlag = true;

src/commands/config.ts

@@ -1,4 +1,4 @@
-import { Command } from '@oclif/core';
+import { Command, Flags } from '@oclif/core';
 import { ConfigService } from '../services/config.service';
 import { CLIUtils } from '../utils/cli.utils';
 import { UsageService } from '../services/usage.service';
@@ -10,26 +10,42 @@ export default class Config extends Command {
   static readonly description = 'Display useful information from the user logged into the Internxt CLI.';
   static readonly aliases = [];
   static readonly examples = ['<%= config.bin %> <%= command.id %>'];
-  static readonly flags = {};
+  static readonly flags = {
+    ...CLIUtils.CommonFlags,
+    extended: Flags.boolean({
+      char: 'e',
+      description: 'Displays additional information in the list.',
+      required: false,
+    }),
+  };
   static readonly enableJsonFlag = true;
 
   public run = async () => {
+    const { flags } = await this.parse(Config);
+
     const userCredentials = await ConfigService.instance.readUser();
     if (userCredentials?.user) {
-      const usedSpace = FormatUtils.humanFileSize((await UsageService.instance.fetchUsage()).total);
+      const usedSpace = FormatUtils.humanFileSize(await UsageService.instance.fetchUsage());
       const availableSpace = FormatUtils.formatLimit(await UsageService.instance.fetchSpaceLimit());
 
       const configList = [
         { key: 'Email', value: userCredentials.user.email },
+        { key: 'User name', value: `${userCredentials.user.name} ${userCredentials.user.lastname}` },
         { key: 'Root folder ID', value: userCredentials.user.rootFolderId },
         { key: 'Used space', value: usedSpace },
         { key: 'Available space', value: availableSpace },
       ];
-      const header: Header[] = [
+      if (flags.extended) {
+        configList.push(
+          { key: 'User ID', value: userCredentials.user.uuid },
+          { key: 'Created at', value: userCredentials.user.createdAt },
+        );
+      }
+      const headers: Header[] = [
         { value: 'key', alias: 'Key' },
         { value: 'value', alias: 'Value' },
       ];
-      CLIUtils.table(this.log.bind(this), header, configList);
+      CLIUtils.table(this.log.bind(this), headers, configList);
 
       return { success: true, config: Object.fromEntries(configList.map(({ key, value }) => [key, value])) };
     } else {

src/commands/create-folder.ts

@@ -9,7 +9,7 @@ import { AsyncUtils } from '../utils/async.utils';
 export default class CreateFolder extends Command {
   static readonly args = {};
   static readonly description = 'Create a folder in your Internxt Drive';
-  static readonly aliases = [];
+  static readonly aliases = ['create:folder'];
   static readonly examples = ['<%= config.bin %> <%= command.id %>'];
   static readonly flags = {
     ...CLIUtils.CommonFlags,
@@ -36,14 +36,12 @@ export default class CreateFolder extends Command {
     if (!userCredentials) throw new MissingCredentialsError();
 
     const folderName = await this.getFolderName(flags['name'], nonInteractive);
-    let folderUuid = await this.getFolderUuid(flags['id'], nonInteractive);
-    if (folderUuid.trim().length === 0) {
-      // folderId is empty from flags&prompt, which means we should use RootFolderUuid
-      folderUuid = userCredentials.user.rootFolderId;
-    }
+
+    const folderUuidFromFlag = await this.getFolderUuid(flags['id'], nonInteractive);
+    const folderUuid = await CLIUtils.fallbackToRootFolderIdIfEmpty(folderUuidFromFlag, userCredentials);
 
     CLIUtils.doing('Creating folder...', flags['json']);
-    const [createNewFolder, requestCanceler] = DriveFolderService.instance.createFolder({
+    const [createNewFolder, requestCanceler] = await DriveFolderService.instance.createFolder({
       plainName: folderName,
       parentFolderUuid: folderUuid,
     });

src/commands/download-file.ts

@@ -75,13 +75,16 @@ export default class DownloadFile extends Command {
 
       // Prepare the network
       const { user } = await AuthService.instance.getAuthDetails();
-      const networkFacade = CLIUtils.prepareNetwork({ loginUserDetails: user, jsonFlag: flags['json'] });
+
+      CLIUtils.doing('Preparing Network', flags['json']);
+      const { networkFacade, bucket, mnemonic } = await CLIUtils.prepareNetwork(user);
+      CLIUtils.done(flags['json']);
       // Download the file
       const fileWriteStream = createWriteStream(downloadPath);
 
       const [executeDownload, abortable] = await networkFacade.downloadToStream(
-        driveFile.bucket,
-        user.mnemonic,
+        bucket,
+        mnemonic,
         driveFile.fileId,
         driveFile.size,
         StreamUtils.writeStreamToWritableStream(fileWriteStream),

src/commands/list.ts

@@ -35,11 +35,8 @@ export default class List extends Command {
     const userCredentials = await ConfigService.instance.readUser();
     if (!userCredentials) throw new MissingCredentialsError();
 
-    let folderUuid = await this.getFolderUuid(flags['id'], nonInteractive);
-    if (folderUuid.trim().length === 0) {
-      // folderId is empty from flags&prompt, which means we should use RootFolderUuid
-      folderUuid = userCredentials.user.rootFolderId;
-    }
+    const folderUuidFromFlag = await this.getFolderUuid(flags['id'], nonInteractive);
+    const folderUuid = await CLIUtils.fallbackToRootFolderIdIfEmpty(folderUuidFromFlag, userCredentials);
 
     const { folders, files } = await DriveFolderService.instance.getFolderContent(folderUuid);
 

src/commands/move-file.ts

@@ -1,7 +1,7 @@
 import { Command, Flags } from '@oclif/core';
 import { ConfigService } from '../services/config.service';
 import { CLIUtils } from '../utils/cli.utils';
-import { MissingCredentialsError, NotValidFileUuidError, NotValidFolderUuidError } from '../types/command.types';
+import { MissingCredentialsError, NotValidFileUuidError } from '../types/command.types';
 import { ValidationService } from '../services/validation.service';
 import { DriveFileService } from '../services/drive/drive-file.service';
 
@@ -34,11 +34,17 @@ export default class MoveFile extends Command {
     if (!userCredentials) throw new MissingCredentialsError();
 
     const fileUuid = await this.getFileUuid(flags['id'], nonInteractive);
-    let destinationFolderUuid = await this.getDestinationFolderUuid(flags['destination'], nonInteractive);
-    if (destinationFolderUuid.trim().length === 0) {
-      // destination id is empty from flags&prompt, which means we should use RootFolderUuid
-      destinationFolderUuid = userCredentials.user.rootFolderId;
-    }
+
+    const destinationFolderUuidFromFlag = await CLIUtils.getDestinationFolderUuid({
+      destinationFolderUuidFlag: flags['destination'],
+      destinationFlagName: MoveFile.flags['destination'].name,
+      nonInteractive,
+      reporter: this.log.bind(this),
+    });
+    const destinationFolderUuid = await CLIUtils.fallbackToRootFolderIdIfEmpty(
+      destinationFolderUuidFromFlag,
+      userCredentials,
+    );
 
     const newFile = await DriveFileService.instance.moveFile(fileUuid, { destinationFolder: destinationFolderUuid });
     const message = `File moved successfully to: ${destinationFolderUuid}`;
@@ -78,30 +84,4 @@ export default class MoveFile extends Command {
     );
     return fileUuid;
   };
-
-  private getDestinationFolderUuid = async (
-    destinationFolderUuidFlag: string | undefined,
-    nonInteractive: boolean,
-  ): Promise<string> => {
-    const destinationFolderUuid = await CLIUtils.getValueFromFlag(
-      {
-        value: destinationFolderUuidFlag,
-        name: MoveFile.flags['destination'].name,
-      },
-      {
-        nonInteractive,
-        prompt: {
-          message: 'What is the destination folder id? (leave empty for the root folder)',
-          options: { type: 'input' },
-        },
-      },
-      {
-        validate: ValidationService.instance.validateUUIDv4,
-        error: new NotValidFolderUuidError(),
-        canBeEmpty: true,
-      },
-      this.log.bind(this),
-    );
-    return destinationFolderUuid;
-  };
 }

src/commands/move-folder.ts

@@ -34,11 +34,17 @@ export default class MoveFolder extends Command {
     if (!userCredentials) throw new MissingCredentialsError();
 
     const folderUuid = await this.getFolderUuid(flags['id'], nonInteractive);
-    let destinationFolderUuid = await this.getDestinationFolderUuid(flags['destination'], nonInteractive);
-    if (destinationFolderUuid.trim().length === 0) {
-      // destination id is empty from flags&prompt, which means we should use RootFolderUuid
-      destinationFolderUuid = userCredentials.user.rootFolderId;
-    }
+
+    const destinationFolderUuidFromFlag = await CLIUtils.getDestinationFolderUuid({
+      destinationFolderUuidFlag: flags['destination'],
+      destinationFlagName: MoveFolder.flags['destination'].name,
+      nonInteractive,
+      reporter: this.log.bind(this),
+    });
+    const destinationFolderUuid = await CLIUtils.fallbackToRootFolderIdIfEmpty(
+      destinationFolderUuidFromFlag,
+      userCredentials,
+    );
 
     const newFolder = await DriveFolderService.instance.moveFolder(folderUuid, {
       destinationFolder: destinationFolderUuid,
@@ -80,30 +86,4 @@ export default class MoveFolder extends Command {
     );
     return folderUuid;
   };
-
-  private getDestinationFolderUuid = async (
-    destinationFolderUuidFlag: string | undefined,
-    nonInteractive: boolean,
-  ): Promise<string> => {
-    const destinationFolderUuid = await CLIUtils.getValueFromFlag(
-      {
-        value: destinationFolderUuidFlag,
-        name: MoveFolder.flags['destination'].name,
-      },
-      {
-        nonInteractive,
-        prompt: {
-          message: 'What is the destination folder id? (leave empty for the root folder)',
-          options: { type: 'input' },
-        },
-      },
-      {
-        validate: ValidationService.instance.validateUUIDv4,
-        error: new NotValidFolderUuidError(),
-        canBeEmpty: true,
-      },
-      this.log.bind(this),
-    );
-    return destinationFolderUuid;
-  };
 }

src/commands/trash-restore-file.ts

@@ -1,7 +1,7 @@
 import { Command, Flags } from '@oclif/core';
 import { ConfigService } from '../services/config.service';
 import { CLIUtils } from '../utils/cli.utils';
-import { MissingCredentialsError, NotValidFileUuidError, NotValidFolderUuidError } from '../types/command.types';
+import { MissingCredentialsError, NotValidFileUuidError } from '../types/command.types';
 import { ValidationService } from '../services/validation.service';
 import { DriveFileService } from '../services/drive/drive-file.service';
 
@@ -35,12 +35,17 @@ export default class TrashRestoreFile extends Command {
     if (!userCredentials) throw new MissingCredentialsError();
 
     const fileUuid = await this.getFileUuid(flags['id'], nonInteractive);
-    let destinationFolderUuid = await this.getDestinationFolderUuid(flags['destination'], nonInteractive);
 
-    if (destinationFolderUuid.trim().length === 0) {
-      // destinationFolderUuid is empty from flags&prompt, which means we should use RootFolderUuid
-      destinationFolderUuid = userCredentials.user.rootFolderId;
-    }
+    const destinationFolderUuidFromFlag = await CLIUtils.getDestinationFolderUuid({
+      destinationFolderUuidFlag: flags['destination'],
+      destinationFlagName: TrashRestoreFile.flags['destination'].name,
+      nonInteractive,
+      reporter: this.log.bind(this),
+    });
+    const destinationFolderUuid = await CLIUtils.fallbackToRootFolderIdIfEmpty(
+      destinationFolderUuidFromFlag,
+      userCredentials,
+    );
 
     const file = await DriveFileService.instance.moveFile(fileUuid, { destinationFolder: destinationFolderUuid });
     const message = `File restored successfully to: ${destinationFolderUuid}`;
@@ -80,30 +85,4 @@ export default class TrashRestoreFile extends Command {
     );
     return fileUuid;
   };
-
-  private getDestinationFolderUuid = async (
-    destinationFolderUuidFlag: string | undefined,
-    nonInteractive: boolean,
-  ): Promise<string> => {
-    const destinationFolderUuid = await CLIUtils.getValueFromFlag(
-      {
-        value: destinationFolderUuidFlag,
-        name: TrashRestoreFile.flags['destination'].name,
-      },
-      {
-        nonInteractive,
-        prompt: {
-          message: 'What is the destination folder id? (leave empty for the root folder)',
-          options: { type: 'input' },
-        },
-      },
-      {
-        validate: ValidationService.instance.validateUUIDv4,
-        error: new NotValidFolderUuidError(),
-        canBeEmpty: true,
-      },
-      this.log.bind(this),
-    );
-    return destinationFolderUuid;
-  };
 }

src/commands/trash-restore-folder.ts

@@ -35,12 +35,17 @@ export default class TrashRestoreFolder extends Command {
     if (!userCredentials) throw new MissingCredentialsError();
 
     const folderUuid = await this.getFolderUuid(flags['id'], nonInteractive);
-    let destinationFolderUuid = await this.getDestinationFolderUuid(flags['destination'], nonInteractive);
 
-    if (destinationFolderUuid.trim().length === 0) {
-      // destinationFolderUuid is empty from flags&prompt, which means we should use RootFolderUuid
-      destinationFolderUuid = userCredentials.user.rootFolderId;
-    }
+    const destinationFolderUuidFromFlag = await CLIUtils.getDestinationFolderUuid({
+      destinationFolderUuidFlag: flags['destination'],
+      destinationFlagName: TrashRestoreFolder.flags['destination'].name,
+      nonInteractive,
+      reporter: this.log.bind(this),
+    });
+    const destinationFolderUuid = await CLIUtils.fallbackToRootFolderIdIfEmpty(
+      destinationFolderUuidFromFlag,
+      userCredentials,
+    );
 
     const folder = await DriveFolderService.instance.moveFolder(folderUuid, {
       destinationFolder: destinationFolderUuid,
@@ -82,30 +87,4 @@ export default class TrashRestoreFolder extends Command {
     );
     return folderUuid;
   };
-
-  private getDestinationFolderUuid = async (
-    destinationFolderUuidFlag: string | undefined,
-    nonInteractive: boolean,
-  ): Promise<string> => {
-    const destinationFolderUuid = await CLIUtils.getValueFromFlag(
-      {
-        value: destinationFolderUuidFlag,
-        name: TrashRestoreFolder.flags['destination'].name,
-      },
-      {
-        nonInteractive,
-        prompt: {
-          message: 'What is the destination folder id? (leave empty for the root folder)',
-          options: { type: 'input' },
-        },
-      },
-      {
-        validate: ValidationService.instance.validateUUIDv4,
-        error: new NotValidFolderUuidError(),
-        canBeEmpty: true,
-      },
-      this.log.bind(this),
-    );
-    return destinationFolderUuid;
-  };
 }