@wireapp/core 30.0.5 → 30.3.0

package/CHANGELOG.md

@@ -3,6 +3,39 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [30.3.0](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/compare/@wireapp/core@30.2.0...@wireapp/core@30.3.0) (2022-09-07)
+
+
+### Features
+
+* Add ability to send external proposal (FS-689) ([#4376](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/issues/4376)) ([bf8e7dd](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/commit/bf8e7ddd7ea4660c8a5b6eea93e27ec14485de6c))
+
+
+
+
+
+# [30.2.0](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/compare/@wireapp/core@30.1.0...@wireapp/core@30.2.0) (2022-09-07)
+
+
+### Features
+
+* Also create MLS device when logging in with old proteus device ([#4378](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/issues/4378)) ([31cea5a](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/commit/31cea5a31ac69ffb269f33458896d091de6c171f))
+
+
+
+
+
+# [30.1.0](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/compare/@wireapp/core@30.0.5...@wireapp/core@30.1.0) (2022-09-07)
+
+
+### Features
+
+* Ability to clear database when logging out ([#4377](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/issues/4377)) ([e5f7a9c](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/commit/e5f7a9c4f36a018d2bd13eca8a0d751cf7f9805c))
+
+
+
+
+
 ## [30.0.5](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/compare/@wireapp/core@30.0.4...@wireapp/core@30.0.5) (2022-09-02)
 
 **Note:** Version bump only for package @wireapp/core

package/package.json

@@ -7,7 +7,7 @@
     "@otak/core-crypto": "0.3.0-es2017",
     "@types/long": "4.0.1",
     "@types/node": "~14",
-    "@wireapp/api-client": "20.0.4",
+    "@wireapp/api-client": "20.1.0",
     "@wireapp/commons": "4.3.0",
     "@wireapp/cryptobox": "12.8.0",
     "@wireapp/store-engine-dexie": "1.6.10",
@@ -77,6 +77,6 @@
     "test:node": "nyc jasmine --config=jasmine.json",
     "watch": "tsc ---watch"
   },
-  "version": "30.0.5",
-  "gitHead": "a6993ee7b942cf5c4fe85dbb8cf742c546765a36"
+  "version": "30.3.0",
+  "gitHead": "0a4d4b6057006da93a731115ab02c9753b155127"
 }

package/src/main/Account.d.ts

@@ -166,7 +166,11 @@ export declare class Account<T = any> extends EventEmitter {
     private createMLSClient;
     private registerClient;
     private resetContext;
-    logout(): Promise<void>;
+    /**
+     * Will logout the current user
+     * @param clearData if set to `true` will completely wipe any database that was created by the Account
+     */
+    logout(clearData?: boolean): Promise<void>;
     /**
      * Will download and handle the notification stream since last stored notification id.
      * Once the notification stream has been handled from backend, will then connect to the websocket and start listening to incoming events
@@ -210,6 +214,7 @@ export declare class Account<T = any> extends EventEmitter {
         dryRun?: boolean;
     }): Promise<() => void>;
     private generateDbName;
+    private generateSecretsDbName;
     private initEngine;
 }
 export {};

package/src/main/Account.js

@@ -269,25 +269,37 @@ class Account extends events_1.EventEmitter {
         return loadedClient;
     }
     async createMLSClient(client, context, mlsConfig, entropyData) {
+        if (!this.service) {
+            throw new Error('Services are not set.');
+        }
         const coreCryptoKeyId = 'corecrypto-key';
         const { CoreCrypto } = await Promise.resolve().then(() => __importStar(require('@otak/core-crypto')));
-        const dbName = `secrets-${this.generateDbName(context)}`;
+        const dbName = this.generateSecretsDbName(context);
         const secretStore = mlsConfig.secretsCrypto
             ? await (0, encryptedStore_1.createCustomEncryptedStore)(dbName, mlsConfig.secretsCrypto)
             : await (0, encryptedStore_1.createEncryptedStore)(dbName);
         let key = await secretStore.getsecretValue(coreCryptoKeyId);
+        let isNewMLSDevice = false;
         if (!key) {
             key = window.crypto.getRandomValues(new Uint8Array(16));
             await secretStore.saveSecretValue(coreCryptoKeyId, key);
+            // Keeping track that this device is a new MLS device (but can be an old proteus device)
+            isNewMLSDevice = true;
         }
         const { userId, domain } = this.apiClient.context;
-        return CoreCrypto.init({
+        const mlsClient = await CoreCrypto.init({
             databaseName: `corecrypto-${this.generateDbName(context)}`,
             key: bazinga64_1.Encoder.toBase64(key).asString,
             clientId: `${userId}:${client.id}@${domain}`,
             wasmFilePath: mlsConfig.coreCrypoWasmFilePath,
             entropySeed: entropyData,
         });
+        if (isNewMLSDevice) {
+            // If the device is new, we need to upload keypackages and public key to the backend
+            await this.service.client.uploadMLSPublicKeys(await mlsClient.clientPublicKey(), client.id);
+            await this.service.client.uploadMLSKeyPackages(await mlsClient.clientKeypackages(this.nbPrekeys), client.id);
+        }
+        return mlsClient;
     }
     async registerClient(loginData, clientInfo = coreDefaultClient, entropyData) {
         if (!this.service) {
@@ -297,8 +309,6 @@ class Account extends events_1.EventEmitter {
         const registeredClient = await this.service.client.register(loginData, clientInfo, entropyData);
         if (this.mlsConfig) {
             this.coreCryptoClient = await this.createMLSClient(registeredClient, this.apiClient.context, this.mlsConfig, entropyData);
-            await this.service.client.uploadMLSPublicKeys(await this.coreCryptoClient.clientPublicKey(), registeredClient.id);
-            await this.service.client.uploadMLSKeyPackages(await this.coreCryptoClient.clientKeypackages(this.nbPrekeys), registeredClient.id);
         }
         this.apiClient.context.clientId = registeredClient.id;
         this.logger.info('Client is created');
@@ -311,7 +321,15 @@ class Account extends events_1.EventEmitter {
         delete this.apiClient.context;
         delete this.service;
     }
-    async logout() {
+    /**
+     * Will logout the current user
+     * @param clearData if set to `true` will completely wipe any database that was created by the Account
+     */
+    async logout(clearData = false) {
+        if (clearData && this.coreCryptoClient) {
+            await this.coreCryptoClient.wipe();
+            await (0, encryptedStore_1.deleteEncryptedStore)(this.generateSecretsDbName(this.apiClient.context));
+        }
         await this.apiClient.logout();
         this.resetContext();
     }
@@ -387,6 +405,9 @@ class Account extends events_1.EventEmitter {
         const clientType = context.clientType === client_1.ClientType.NONE ? '' : `@${context.clientType}`;
         return `wire@${this.apiClient.config.urls.name}@${context.userId}${clientType}`;
     }
+    generateSecretsDbName(context) {
+        return `secrets-${this.generateDbName(context)}`;
+    }
     async initEngine(context) {
         const dbName = this.generateDbName(context);
         this.logger.log(`Initialising store with name "${dbName}"...`);

package/src/main/conversation/ConversationService/ConversationService.d.ts

@@ -1,4 +1,4 @@
-import type { CoreCrypto } from '@otak/core-crypto';
+import { CoreCrypto } from '@otak/core-crypto';
 import type { APIClient } from '@wireapp/api-client';
 import { MessageSendingStatus, Conversation, DefaultConversationRoleName, MutedStatus, NewConversation, QualifiedUserClients, UserClients, ClientMismatch } from '@wireapp/api-client/src/conversation';
 import type { ConversationMemberLeaveEvent } from '@wireapp/api-client/src/event';
@@ -157,4 +157,12 @@ export declare class ConversationService {
     addUsersToMLSConversation({ qualifiedUserIds, groupId, conversationId, }: Required<AddUsersParams>): Promise<MLSReturnType>;
     private sendCommitBundleRemovalMessages;
     removeUsersFromMLSConversation({ groupId, conversationId, qualifiedUserIds, }: RemoveUsersParams): Promise<MLSReturnType>;
+    /**
+     * Will send an external proposal for the current device to join a specific conversation.
+     * In order for the external proposal to be sent correctly, the underlying mls conversation needs to be in a non-established state
+     * @param conversationGroupId The conversation to join
+     * @param epoch The current epoch of the local conversation
+     */
+    sendExternalJoinProposal(conversationGroupId: string, epoch: number): Promise<void>;
+    isMLSConversationEstablished(conversationGroupId: string): Promise<boolean>;
 }

package/src/main/conversation/ConversationService/ConversationService.js

@@ -944,6 +944,28 @@ class ConversationService {
             conversation,
         };
     }
+    /**
+     * Will send an external proposal for the current device to join a specific conversation.
+     * In order for the external proposal to be sent correctly, the underlying mls conversation needs to be in a non-established state
+     * @param conversationGroupId The conversation to join
+     * @param epoch The current epoch of the local conversation
+     */
+    async sendExternalJoinProposal(conversationGroupId, epoch) {
+        const coreCryptoClient = this.coreCryptoClientProvider();
+        const groupIdDecodedFromBase64 = bazinga64_1.Decoder.fromBase64(conversationGroupId).asBytes;
+        const externalProposal = await coreCryptoClient.newExternalProposal(0 /* Add */, {
+            epoch,
+            conversationId: groupIdDecodedFromBase64,
+        });
+        await this.apiClient.api.conversation.postMlsMessage(
+        //@todo: it's temporary - we wait for core-crypto fix to return the actual Uint8Array instead of regular array
+        optionalToUint8Array(externalProposal));
+    }
+    async isMLSConversationEstablished(conversationGroupId) {
+        const coreCryptoClient = this.coreCryptoClientProvider();
+        const groupIdDecodedFromBase64 = bazinga64_1.Decoder.fromBase64(conversationGroupId).asBytes;
+        return coreCryptoClient.conversationExists(groupIdDecodedFromBase64);
+    }
 }
 exports.ConversationService = ConversationService;
 //# sourceMappingURL=ConversationService.js.map

package/src/main/util/encryptedStore.d.ts

@@ -41,4 +41,5 @@ export declare function createEncryptedStore(dbName: string): Promise<EncryptedS
  * @param config contains the encrypt and decrypt methods
  */
 export declare function createCustomEncryptedStore<EncryptedPayload>(dbName: string, config: EncryptedStoreConfig<EncryptedPayload>): Promise<EncryptedStore<EncryptedPayload>>;
+export declare function deleteEncryptedStore(dbName: string): Promise<void>;
 export {};

package/src/main/util/encryptedStore.js

@@ -30,7 +30,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _EncryptedStore_decrypt, _EncryptedStore_encrypt;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createCustomEncryptedStore = exports.createEncryptedStore = void 0;
+exports.deleteEncryptedStore = exports.createCustomEncryptedStore = exports.createEncryptedStore = void 0;
 const idb_1 = require("idb");
 class EncryptedStore {
     constructor(db, { encrypt, decrypt }) {
@@ -109,4 +109,8 @@ async function createCustomEncryptedStore(dbName, config) {
     return new EncryptedStore(db, config);
 }
 exports.createCustomEncryptedStore = createCustomEncryptedStore;
+async function deleteEncryptedStore(dbName) {
+    return (0, idb_1.deleteDB)(dbName);
+}
+exports.deleteEncryptedStore = deleteEncryptedStore;
 //# sourceMappingURL=encryptedStore.js.map