diff --git a/package.json b/package.json index c91cb0e0..00f1d2ae 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@internxt/sdk", "author": "Internxt ", - "version": "1.18.0", + "version": "1.19.0", "description": "An sdk for interacting with Internxt's services", "repository": { "type": "git", diff --git a/src/auth/index.ts b/src/auth/index.ts index 3a6d7caa..b519de47 100644 --- a/src/auth/index.ts +++ b/src/auth/index.ts @@ -118,12 +118,6 @@ export class Auth { password: registerDetails.password, mnemonic: registerDetails.mnemonic, salt: registerDetails.salt, - /** - / @deprecated The individual fields for keys should not be used - */ - privateKey: registerDetails.keys.privateKeyEncrypted, - publicKey: registerDetails.keys.publicKey, - revocationKey: registerDetails.keys.revocationCertificate, keys: { ecc: { publicKey: registerDetails.keys.ecc.publicKey, @@ -181,12 +175,6 @@ export class Auth { password: registerDetails.password, mnemonic: registerDetails.mnemonic, salt: registerDetails.salt, - /** - / @deprecated The individual fields for keys should not be used - */ - privateKey: registerDetails.keys.privateKeyEncrypted, - publicKey: registerDetails.keys.publicKey, - revocationKey: registerDetails.keys.revocationCertificate, keys: { ecc: { publicKey: registerDetails.keys.ecc.publicKey, @@ -330,43 +318,30 @@ export class Auth { const encryptedPasswordHash = cryptoProvider.encryptPasswordHash(details.password, encryptedSalt); const keys = await cryptoProvider.generateKeys(details.password); - return this.client - .post<{ - token: Token; - newToken: Token; - user: UserSettings; - userTeam: TeamsSettings | null; - }>( - '/auth/login/access', - { - email: details.email, - password: encryptedPasswordHash, - tfa: details.tfaCode, - /** - / @deprecated The individual fields for keys should not be used - */ - privateKey: keys.privateKeyEncrypted, - publicKey: keys.publicKey, - revocateKey: keys.revocationCertificate, - keys: { - ecc: { - publicKey: keys.ecc.publicKey, - privateKey: keys.ecc.privateKeyEncrypted, - }, - kyber: { - publicKey: keys.kyber.publicKey, - privateKey: keys.kyber.privateKeyEncrypted, - }, + return this.client.post<{ + token: Token; + newToken: Token; + user: UserSettings; + userTeam: TeamsSettings | null; + }>( + '/auth/login/access', + { + email: details.email, + password: encryptedPasswordHash, + tfa: details.tfaCode, + keys: { + ecc: { + publicKey: keys.ecc.publicKey, + privateKey: keys.ecc.privateKeyEncrypted, + }, + kyber: { + publicKey: keys.kyber.publicKey, + privateKey: keys.kyber.privateKeyEncrypted, }, }, - this.basicHeaders(), - ) - .then((data) => { - // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore - data.user.revocationKey = data.user.revocateKey; // TODO : remove when all projects use SDK - return data; - }); + }, + this.basicHeaders(), + ); } /** @@ -422,27 +397,20 @@ export class Auth { const encryptedSalt = securityDetails.encryptedSalt; const encryptedPasswordHash = cryptoProvider.encryptPasswordHash(details.password, encryptedSalt); - return this.client - .post<{ - token: Token; - newToken: Token; - user: UserSettings; - userTeam: TeamsSettings | null; - }>( - '/auth/login/access', - { - email: details.email, - password: encryptedPasswordHash, - tfa: details.tfaCode, - }, - this.basicHeaders(), - ) - .then((data) => { - // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore - data.user.revocationKey = data.user.revocateKey; // TODO : remove when all projects use SDK - return data; - }); + return this.client.post<{ + token: Token; + newToken: Token; + user: UserSettings; + userTeam: TeamsSettings | null; + }>( + '/auth/login/access', + { + email: details.email, + password: encryptedPasswordHash, + tfa: details.tfaCode, + }, + this.basicHeaders(), + ); } /** @@ -454,12 +422,6 @@ export class Auth { return this.client.patch( '/user/keys', { - /** - / @deprecated The individual fields for keys should not be used - */ - publicKey: keys.publicKey, - privateKey: keys.privateKeyEncrypted, - revocationKey: keys.revocationCertificate, ecc: { publicKey: keys.ecc.publicKey, privateKey: keys.ecc.privateKeyEncrypted, diff --git a/src/auth/types.ts b/src/auth/types.ts index 013e9817..18b8284e 100644 --- a/src/auth/types.ts +++ b/src/auth/types.ts @@ -56,9 +56,6 @@ export interface RegisterPreCreatedUserResponse { uuid: UUID; } export interface Keys { - privateKeyEncrypted: string; - publicKey: string; - revocationCertificate: string; ecc: { publicKey: string; privateKeyEncrypted: string; @@ -111,7 +108,6 @@ export interface PrivateKeysExtended { ecc: { public: string; private: string; - revocationKey: string; }; kyber: { public: string; diff --git a/test/auth/index.test.ts b/test/auth/index.test.ts index 394f286b..d04173dd 100644 --- a/test/auth/index.test.ts +++ b/test/auth/index.test.ts @@ -43,9 +43,6 @@ describe('# auth service tests', () => { password: registerDetails.password, mnemonic: registerDetails.mnemonic, salt: registerDetails.salt, - privateKey: registerDetails.keys.privateKeyEncrypted, - publicKey: registerDetails.keys.publicKey, - revocationKey: registerDetails.keys.revocationCertificate, keys: { ecc: { publicKey: registerDetails.keys.ecc.publicKey, @@ -176,9 +173,6 @@ describe('# auth service tests', () => { password: registerDetails.password, mnemonic: registerDetails.mnemonic, salt: registerDetails.salt, - privateKey: registerDetails.keys.privateKeyEncrypted, - publicKey: registerDetails.keys.publicKey, - revocationKey: registerDetails.keys.revocationCertificate, keys: { ecc: { publicKey: registerDetails.keys.ecc.publicKey, @@ -374,9 +368,6 @@ describe('# auth service tests', () => { encryptPasswordHash: (password, encryptedSalt) => password + '-' + encryptedSalt, generateKeys: (password: Password) => { const keys: Keys = { - privateKeyEncrypted: 'priv', - publicKey: 'pub', - revocationCertificate: 'rev', ecc: { publicKey: 'pub', privateKeyEncrypted: 'priv', @@ -395,13 +386,11 @@ describe('# auth service tests', () => { sKey: 'encrypted_salt', }) .mockResolvedValueOnce({ - user: { - revocateKey: 'key', - }, + user: {}, }); // Act - const body = await client.login(loginDetails, cryptoProvider); + await client.login(loginDetails, cryptoProvider); // Assert expect(postStub).toHaveBeenCalledTimes(2); @@ -418,9 +407,6 @@ describe('# auth service tests', () => { email: loginDetails.email, password: 'password-encrypted_salt', tfa: loginDetails.tfaCode, - privateKey: 'priv', - publicKey: 'pub', - revocateKey: 'rev', keys: { ecc: { publicKey: 'pub', @@ -434,12 +420,6 @@ describe('# auth service tests', () => { }, headers, ); - expect(body).toEqual({ - user: { - revocateKey: 'key', - revocationKey: 'key', - }, - }); }); }); @@ -456,9 +436,6 @@ describe('# auth service tests', () => { encryptPasswordHash: (password, encryptedSalt) => password + '-' + encryptedSalt, generateKeys: (password: Password) => { const keys: Keys = { - privateKeyEncrypted: 'priv', - publicKey: 'pub', - revocationCertificate: 'rev', ecc: { publicKey: 'pub', privateKeyEncrypted: 'priv', @@ -477,13 +454,11 @@ describe('# auth service tests', () => { sKey: 'encrypted_salt', }) .mockResolvedValueOnce({ - user: { - revocateKey: 'key', - }, + user: {}, }); // Act - const body = await client.loginWithoutKeys(loginDetails, cryptoProvider); + await client.loginWithoutKeys(loginDetails, cryptoProvider); // Assert expect(postStub).toHaveBeenCalledTimes(2); @@ -503,12 +478,6 @@ describe('# auth service tests', () => { }, headers, ); - expect(body).toEqual({ - user: { - revocateKey: 'key', - revocationKey: 'key', - }, - }); }); it('Should bubble up the error on first call failure', async () => { @@ -525,9 +494,6 @@ describe('# auth service tests', () => { encryptPasswordHash: () => '', generateKeys: (password: Password) => { const keys: Keys = { - privateKeyEncrypted: '', - publicKey: '', - revocationCertificate: '', ecc: { publicKey: '', privateKeyEncrypted: '', @@ -555,9 +521,6 @@ describe('# auth service tests', () => { const token: Token = 'my-secure-token'; const { client, headers } = clientAndHeadersWithToken('', 'name', '0.1', token); const keys: Keys = { - privateKeyEncrypted: 'prik', - publicKey: 'pubk', - revocationCertificate: 'crt', ecc: { publicKey: 'pub', privateKeyEncrypted: 'priv', @@ -576,9 +539,6 @@ describe('# auth service tests', () => { expect(axiosStub).toHaveBeenCalledWith( '/user/keys', { - publicKey: 'pubk', - privateKey: 'prik', - revocationKey: 'crt', ecc: { publicKey: 'pub', privateKey: 'priv', @@ -955,7 +915,6 @@ describe('# auth service tests', () => { ecc: { public: 'ecc-public-key', private: 'ecc-private-key', - revocationKey: 'ecc-revocation-key', }, kyber: { public: 'kyber-public-key',