Merge pull request #129 from internxt/fix/upgrade-sdk-to-1.6.4

[_]: fix/bump-to-internxt-sdk-1.6.4

Author: sg-gs

README.md

@@ -31,7 +31,7 @@ $ npm install -g @internxt/cli
 $ internxt COMMAND
 running command...
 $ internxt (--version)
-@internxt/cli/1.3.0 win32-x64 node-v20.2.0
+@internxt/cli/1.3.1 darwin-x64 node-v20.12.2
 $ internxt --help [COMMAND]
 USAGE
   $ internxt COMMAND
@@ -52,18 +52,18 @@ USAGE
 * [`internxt logs`](#internxt-logs)
 * [`internxt move-file`](#internxt-move-file)
 * [`internxt move-folder`](#internxt-move-folder)
-* [`internxt move file`](#internxt-move-file-1)
-* [`internxt move folder`](#internxt-move-folder-1)
+* [`internxt move file`](#internxt-move-file)
+* [`internxt move folder`](#internxt-move-folder)
 * [`internxt rename`](#internxt-rename)
 * [`internxt trash`](#internxt-trash)
 * [`internxt trash-clear`](#internxt-trash-clear)
 * [`internxt trash-list`](#internxt-trash-list)
 * [`internxt trash-restore-file`](#internxt-trash-restore-file)
 * [`internxt trash-restore-folder`](#internxt-trash-restore-folder)
-* [`internxt trash clear`](#internxt-trash-clear-1)
-* [`internxt trash list`](#internxt-trash-list-1)
-* [`internxt trash restore file`](#internxt-trash-restore-file-1)
-* [`internxt trash restore folder`](#internxt-trash-restore-folder-1)
+* [`internxt trash clear`](#internxt-trash-clear)
+* [`internxt trash list`](#internxt-trash-list)
+* [`internxt trash restore file`](#internxt-trash-restore-file)
+* [`internxt trash restore folder`](#internxt-trash-restore-folder)
 * [`internxt upload`](#internxt-upload)
 * [`internxt webdav ACTION`](#internxt-webdav-action)
 * [`internxt webdav-config ACTION`](#internxt-webdav-config-action)
@@ -84,7 +84,7 @@ EXAMPLES
   $ internxt add-cert
 ```
 
-_See code: [src/commands/add-cert.ts](https://github.com/internxt/cli/blob/v1.3.0/src/commands/add-cert.ts)_
+_See code: [src/commands/add-cert.ts](https://github.com/internxt/cli/blob/v1.3.1/src/commands/add-cert.ts)_
 
 ## `internxt config`
 
@@ -113,7 +113,7 @@ EXAMPLES
   $ internxt config
 ```
 
-_See code: [src/commands/config.ts](https://github.com/internxt/cli/blob/v1.3.0/src/commands/config.ts)_
+_See code: [src/commands/config.ts](https://github.com/internxt/cli/blob/v1.3.1/src/commands/config.ts)_
 
 ## `internxt create-folder`
 
@@ -134,7 +134,7 @@ EXAMPLES
   $ internxt create-folder
 ```
 
-_See code: [src/commands/create-folder.ts](https://github.com/internxt/cli/blob/v1.3.0/src/commands/create-folder.ts)_
+_See code: [src/commands/create-folder.ts](https://github.com/internxt/cli/blob/v1.3.1/src/commands/create-folder.ts)_
 
 ## `internxt download`
 
@@ -157,7 +157,7 @@ EXAMPLES
   $ internxt download
 ```
 
-_See code: [src/commands/download.ts](https://github.com/internxt/cli/blob/v1.3.0/src/commands/download.ts)_
+_See code: [src/commands/download.ts](https://github.com/internxt/cli/blob/v1.3.1/src/commands/download.ts)_
 
 ## `internxt list`
 
@@ -191,15 +191,15 @@ EXAMPLES
   $ internxt list
 ```
 
-_See code: [src/commands/list.ts](https://github.com/internxt/cli/blob/v1.3.0/src/commands/list.ts)_
+_See code: [src/commands/list.ts](https://github.com/internxt/cli/blob/v1.3.1/src/commands/list.ts)_
 
 ## `internxt login`
 
 Logs into an Internxt account. If the account is two-factor protected, then an extra code will be required.
 
 ```
 USAGE
-  $ internxt login [-n] [-e <value>] [-p <value>] [-w <value>]
+  $ internxt login [-n] [-e <value>] [-p <value>] [-w 123456]
 
 FLAGS
   -e, --email=<value>     The email to log in
@@ -217,7 +217,7 @@ EXAMPLES
   $ internxt login
 ```
 
-_See code: [src/commands/login.ts](https://github.com/internxt/cli/blob/v1.3.0/src/commands/login.ts)_
+_See code: [src/commands/login.ts](https://github.com/internxt/cli/blob/v1.3.1/src/commands/login.ts)_
 
 ## `internxt logout`
 
@@ -234,7 +234,7 @@ EXAMPLES
   $ internxt logout
 ```
 
-_See code: [src/commands/logout.ts](https://github.com/internxt/cli/blob/v1.3.0/src/commands/logout.ts)_
+_See code: [src/commands/logout.ts](https://github.com/internxt/cli/blob/v1.3.1/src/commands/logout.ts)_
 
 ## `internxt logs`
 
@@ -251,7 +251,7 @@ EXAMPLES
   $ internxt logs
 ```
 
-_See code: [src/commands/logs.ts](https://github.com/internxt/cli/blob/v1.3.0/src/commands/logs.ts)_
+_See code: [src/commands/logs.ts](https://github.com/internxt/cli/blob/v1.3.1/src/commands/logs.ts)_
 
 ## `internxt move-file`
 
@@ -279,7 +279,7 @@ EXAMPLES
   $ internxt move-file
 ```
 
-_See code: [src/commands/move-file.ts](https://github.com/internxt/cli/blob/v1.3.0/src/commands/move-file.ts)_
+_See code: [src/commands/move-file.ts](https://github.com/internxt/cli/blob/v1.3.1/src/commands/move-file.ts)_
 
 ## `internxt move-folder`
 
@@ -307,7 +307,7 @@ EXAMPLES
   $ internxt move-folder
 ```
 
-_See code: [src/commands/move-folder.ts](https://github.com/internxt/cli/blob/v1.3.0/src/commands/move-folder.ts)_
+_See code: [src/commands/move-folder.ts](https://github.com/internxt/cli/blob/v1.3.1/src/commands/move-folder.ts)_
 
 ## `internxt move file`
 
@@ -384,7 +384,7 @@ EXAMPLES
   $ internxt rename
 ```
 
-_See code: [src/commands/rename.ts](https://github.com/internxt/cli/blob/v1.3.0/src/commands/rename.ts)_
+_See code: [src/commands/rename.ts](https://github.com/internxt/cli/blob/v1.3.1/src/commands/rename.ts)_
 
 ## `internxt trash`
 
@@ -408,7 +408,7 @@ EXAMPLES
   $ internxt trash
 ```
 
-_See code: [src/commands/trash.ts](https://github.com/internxt/cli/blob/v1.3.0/src/commands/trash.ts)_
+_See code: [src/commands/trash.ts](https://github.com/internxt/cli/blob/v1.3.1/src/commands/trash.ts)_
 
 ## `internxt trash-clear`
 
@@ -435,7 +435,7 @@ EXAMPLES
   $ internxt trash-clear
 ```
 
-_See code: [src/commands/trash-clear.ts](https://github.com/internxt/cli/blob/v1.3.0/src/commands/trash-clear.ts)_
+_See code: [src/commands/trash-clear.ts](https://github.com/internxt/cli/blob/v1.3.1/src/commands/trash-clear.ts)_
 
 ## `internxt trash-list`
 
@@ -471,7 +471,7 @@ EXAMPLES
   $ internxt trash-list
 ```
 
-_See code: [src/commands/trash-list.ts](https://github.com/internxt/cli/blob/v1.3.0/src/commands/trash-list.ts)_
+_See code: [src/commands/trash-list.ts](https://github.com/internxt/cli/blob/v1.3.1/src/commands/trash-list.ts)_
 
 ## `internxt trash-restore-file`
 
@@ -499,7 +499,7 @@ EXAMPLES
   $ internxt trash-restore-file
 ```
 
-_See code: [src/commands/trash-restore-file.ts](https://github.com/internxt/cli/blob/v1.3.0/src/commands/trash-restore-file.ts)_
+_See code: [src/commands/trash-restore-file.ts](https://github.com/internxt/cli/blob/v1.3.1/src/commands/trash-restore-file.ts)_
 
 ## `internxt trash-restore-folder`
 
@@ -527,7 +527,7 @@ EXAMPLES
   $ internxt trash-restore-folder
 ```
 
-_See code: [src/commands/trash-restore-folder.ts](https://github.com/internxt/cli/blob/v1.3.0/src/commands/trash-restore-folder.ts)_
+_See code: [src/commands/trash-restore-folder.ts](https://github.com/internxt/cli/blob/v1.3.1/src/commands/trash-restore-folder.ts)_
 
 ## `internxt trash clear`
 
@@ -662,7 +662,7 @@ EXAMPLES
   $ internxt upload
 ```
 
-_See code: [src/commands/upload.ts](https://github.com/internxt/cli/blob/v1.3.0/src/commands/upload.ts)_
+_See code: [src/commands/upload.ts](https://github.com/internxt/cli/blob/v1.3.1/src/commands/upload.ts)_
 
 ## `internxt webdav ACTION`
 
@@ -685,7 +685,7 @@ EXAMPLES
   $ internxt webdav status
 ```
 
-_See code: [src/commands/webdav.ts](https://github.com/internxt/cli/blob/v1.3.0/src/commands/webdav.ts)_
+_See code: [src/commands/webdav.ts](https://github.com/internxt/cli/blob/v1.3.1/src/commands/webdav.ts)_
 
 ## `internxt webdav-config ACTION`
 
@@ -713,7 +713,7 @@ EXAMPLES
   $ internxt webdav-config change-port
 ```
 
-_See code: [src/commands/webdav-config.ts](https://github.com/internxt/cli/blob/v1.3.0/src/commands/webdav-config.ts)_
+_See code: [src/commands/webdav-config.ts](https://github.com/internxt/cli/blob/v1.3.1/src/commands/webdav-config.ts)_
 
 ## `internxt whoami`
 
@@ -730,7 +730,7 @@ EXAMPLES
   $ internxt whoami
 ```
 
-_See code: [src/commands/whoami.ts](https://github.com/internxt/cli/blob/v1.3.0/src/commands/whoami.ts)_
+_See code: [src/commands/whoami.ts](https://github.com/internxt/cli/blob/v1.3.1/src/commands/whoami.ts)_
 <!-- commandsstop -->
 
 # Current Limitations

package.json

@@ -1,6 +1,6 @@
 {
   "author": "Internxt <[email protected]>",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "description": "Internxt CLI to manage your encrypted storage",
   "scripts": {
     "build": "tsc",
@@ -37,7 +37,7 @@
   "dependencies": {
     "@internxt/inxt-js": "^2.0.11",
     "@internxt/lib": "^1.2.1",
-    "@internxt/sdk": "^1.5.25",
+    "@internxt/sdk": "1.6.4",
     "@oclif/core": "^3",
     "axios": "^1.7.7",
     "bip39": "^3.1.0",

src/commands/create-folder.ts

@@ -57,7 +57,7 @@ export default class CreateFolder extends Command {
     const newFolder = await createNewFolder;
     CLIUtils.done();
     CLIUtils.success(
-      `Folder ${newFolder.plain_name} created successfully, view it at view it at ${ConfigService.instance.get('DRIVE_URL')}/folder/${newFolder.uuid}`,
+      `Folder ${newFolder.plainName} created successfully, view it at view it at ${ConfigService.instance.get('DRIVE_URL')}/folder/${newFolder.uuid}`,
     );
   }
 }

src/services/crypto.service.ts

@@ -10,10 +10,10 @@ export class CryptoService {
   public static readonly instance: CryptoService = new CryptoService();
 
   public static readonly cryptoProvider: CryptoProvider = {
-    encryptPasswordHash(password: Password, encryptedSalt: string): string {
+    encryptPasswordHash(password: Password, encryptedSalt: string): Promise<string> {
       const salt = CryptoService.instance.decryptText(encryptedSalt);
       const hashObj = CryptoService.instance.passToHash({ password, salt });
-      return CryptoService.instance.encryptText(hashObj.hash);
+      return Promise.resolve(CryptoService.instance.encryptText(hashObj.hash));
     },
     async generateKeys(password: Password): Promise<Keys> {
       const { privateKeyArmoredEncrypted, publicKeyArmored, revocationCertificate } =
@@ -22,6 +22,14 @@ export class CryptoService {
         privateKeyEncrypted: privateKeyArmoredEncrypted,
         publicKey: publicKeyArmored,
         revocationCertificate: revocationCertificate,
+        ecc: {
+          privateKeyEncrypted: privateKeyArmoredEncrypted,
+          publicKey: publicKeyArmored,
+        },
+        kyber: {
+          privateKeyEncrypted: null,
+          publicKey: null
+        }
       };
       return keys;
     },

src/webdav/handlers/MKCOL.handler.ts

@@ -45,7 +45,7 @@ export class MKCOLRequestHandler implements WebDavMethodHandler {
 
     await driveDatabaseManager.createFolder(
       {
-        name: newFolder.plain_name,
+        name: newFolder.plainName,
         status: 'EXISTS',
         encryptedName: newFolder.name,
         bucket: newFolder.bucket,

test/fixtures/auth.fixture.ts

@@ -1,7 +1,7 @@
 import { UserSettings } from '@internxt/sdk/dist/shared/types/userSettings';
 import crypto from 'crypto';
 
-export const UserFixture = {
+export const UserFixture: UserSettings = {
   userId: crypto.randomBytes(16).toString('hex'),
   uuid: crypto.randomBytes(16).toString('hex'),
   email: crypto.randomBytes(16).toString('hex'),
@@ -20,6 +20,17 @@ export const UserFixture = {
   privateKey: crypto.randomBytes(16).toString('hex'),
   publicKey: crypto.randomBytes(16).toString('hex'),
   revocationKey: crypto.randomBytes(16).toString('hex'),
+  keys: {
+    ecc: {
+      privateKey: crypto.randomBytes(16).toString('hex'),
+      publicKey: crypto.randomBytes(16).toString('hex'),
+      revocationKey: crypto.randomBytes(16).toString('hex'),
+    },
+    kyber: {
+      privateKyberKey: crypto.randomBytes(16).toString('hex'),
+      publicKyberKey: crypto.randomBytes(16).toString('hex'),
+    }
+  },
   teams: false,
   appSumoDetails: null,
   registerCompleted: true,
@@ -47,6 +58,17 @@ export const UserSettingsFixture: UserSettings = {
   privateKey: UserFixture.privateKey,
   publicKey: UserFixture.publicKey,
   revocationKey: UserFixture.revocationKey,
+  keys: {
+    ecc: {
+      privateKey: UserFixture.keys.ecc.privateKey,
+      publicKey: UserFixture.keys.ecc.publicKey,
+      revocationKey: UserFixture.revocationKey,
+    },
+    kyber: {
+      privateKyberKey: UserFixture.keys.kyber.privateKyberKey,
+      publicKyberKey: UserFixture.keys.kyber.publicKyberKey,
+    }
+  },
   teams: UserFixture.teams,
   appSumoDetails: UserFixture.appSumoDetails,
   registerCompleted: UserFixture.registerCompleted,

test/services/crypto.service.test.ts

@@ -57,7 +57,7 @@ describe('Crypto service', () => {
     expect(spyConfigService).to.be.calledWith(envEndpoint.key);
   });
 
-  it('When a password is hashed using CryptoProvider, then it is hashed correctly', () => {
+  it('When a password is hashed using CryptoProvider, then it is hashed correctly', async () => {
     const envEndpoint: { key: keyof ConfigKeys; value: string } = {
       key: 'APP_CRYPTO_SECRET',
       value: crypto.randomBytes(16).toString('hex'),
@@ -74,7 +74,7 @@ describe('Crypto service', () => {
 
     const encryptedSalt = CryptoService.instance.encryptText(password.salt);
     const hashedAndEncryptedPassword = CryptoService.cryptoProvider.encryptPasswordHash(password.value, encryptedSalt);
-    const hashedPassword = CryptoService.instance.decryptText(hashedAndEncryptedPassword);
+    const hashedPassword = CryptoService.instance.decryptText(await hashedAndEncryptedPassword);
 
     const expectedHashedPassword = crypto
       .pbkdf2Sync(password.value, Buffer.from(password.salt, 'hex'), 10000, 256 / 8, 'sha1')
@@ -110,6 +110,14 @@ describe('Crypto service', () => {
       privateKeyEncrypted: keysReturned.privateKeyArmoredEncrypted,
       publicKey: keysReturned.publicKeyArmored,
       revocationCertificate: keysReturned.revocationCertificate,
+      kyber: {
+        privateKeyEncrypted: null,
+        publicKey: null,
+      },
+      ecc: {
+        privateKeyEncrypted: keysReturned.privateKeyArmoredEncrypted,
+        publicKey: keysReturned.publicKeyArmored,
+      }
     };
 
     const resultedKeys = await CryptoService.cryptoProvider.generateKeys(password);

test/services/drive/drive-folder.service.test.ts

@@ -84,12 +84,19 @@ describe('Drive folder Service', () => {
       bucket: 'bucket1',
       id: 0,
       name: 'folder-1',
-      plain_name: 'folder-1',
-      createdAt: '',
-      updatedAt: '',
+      plainName: 'folder-1',
+      createdAt: new Date(),
+      updatedAt: new Date(),
       userId: 0,
       uuid: '1234-5678-9012-3456',
       parentUuid: '0123-5678-9012-3456',
+      encryptVersion: 'aes-03',
+      creationTime: new Date(),
+      deleted: false,
+      deletedAt: null,
+      modificationTime: new Date(),
+      removed: false,
+      removedAt: null,
     };
     sandbox
       .stub(Storage.prototype, 'createFolder')
@@ -101,6 +108,6 @@ describe('Drive folder Service', () => {
     });
 
     const newFolder = await createFolder;
-    expect(newFolder.plain_name).to.be.eq('folder-1');
+    expect(newFolder.plainName).to.be.eq('folder-1');
   });
 });