@wireapp/core 30.1.0 → 30.4.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.4.0](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/compare/@wireapp/core@30.3.0...@wireapp/core@30.4.0) (2022-09-07)
+
+
+### Features
+
+* Update getAllParticipantsClients to use better endpoints without a hack ([#4379](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/issues/4379)) ([f38258d](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/commit/f38258db39e81c4b517126792aa6c605b1ea51c5))
+
+
+
+
+
+# [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)
 
 

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.2.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.1.0",
-  "gitHead": "1d1db30fe5778628cd7b550a0d94891c18792236"
+  "version": "30.4.0",
+  "gitHead": "9df4ed23ee62258dac598e16e86ef037ee143f6e"
 }

package/src/main/Account.js

@@ -269,6 +269,9 @@ 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 = this.generateSecretsDbName(context);
@@ -276,18 +279,27 @@ class Account extends events_1.EventEmitter {
             ? 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');

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';
@@ -92,10 +92,6 @@ export declare class ConversationService {
     })>;
     /**
      * Get a fresh list from backend of clients for all the participants of the conversation.
-     * This is a hacky way of getting all the clients for a conversation.
-     * The idea is to send an empty message to the backend to absolutely no users and let backend reply with a mismatch error.
-     * We then get the missing members in the mismatch, that is our fresh list of participants' clients.
-     *
      * @param {string} conversationId
      * @param {string} conversationDomain? - If given will send the message to the new qualified endpoint
      */
@@ -157,4 +153,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

@@ -63,11 +63,10 @@ class ConversationService {
          * yourself in the list of users if you want to sync a message also to your
          * other clients.
          */
-        return (conversation.members.others
+        return conversation.members.others
             .filter(member => !!member.qualified_id)
             .map(member => member.qualified_id)
-            // TODO(Federation): Use 'domain' from 'conversation.members.self' when backend has it implemented
-            .concat({ domain: this.apiClient.context.domain, id: conversation.members.self.id }));
+            .concat(conversation.members.self.qualified_id);
     }
     /**
      * Will generate a prekey bundle for specific users.
@@ -515,37 +514,18 @@ class ConversationService {
     }
     /**
      * Get a fresh list from backend of clients for all the participants of the conversation.
-     * This is a hacky way of getting all the clients for a conversation.
-     * The idea is to send an empty message to the backend to absolutely no users and let backend reply with a mismatch error.
-     * We then get the missing members in the mismatch, that is our fresh list of participants' clients.
-     *
      * @param {string} conversationId
      * @param {string} conversationDomain? - If given will send the message to the new qualified endpoint
      */
-    getAllParticipantsClients(conversationId, conversationDomain) {
-        const sendingClientId = this.apiClient.validatedClientId;
-        const recipients = {};
-        const text = new Uint8Array();
-        return new Promise(async (resolve) => {
-            const onClientMismatch = (mismatch) => {
-                resolve(mismatch.missing);
-                // When the mismatch happens, we ask the messageService to cancel the sending
-                return false;
-            };
-            if (conversationDomain && this.config.useQualifiedIds) {
-                await this.messageService.sendFederatedMessage(sendingClientId, recipients, text, {
-                    conversationId: { id: conversationId, domain: conversationDomain },
-                    onClientMismatch,
-                    reportMissing: true,
-                });
-            }
-            else {
-                await this.messageService.sendMessage(sendingClientId, recipients, text, {
-                    conversationId,
-                    onClientMismatch,
-                });
-            }
-        });
+    async getAllParticipantsClients(conversationId, conversationDomain) {
+        const qualifiedMembers = await this.getConversationQualifiedMembers(conversationDomain ? { id: conversationId, domain: conversationDomain } : conversationId);
+        const allClients = await this.apiClient.api.user.postListClients({ qualified_users: qualifiedMembers });
+        const qualifiedUserClients = {};
+        Object.entries(allClients.qualified_user_map).map(([domain, userClientMap]) => Object.entries(userClientMap).map(async ([userId, clients]) => {
+            qualifiedUserClients[domain] || (qualifiedUserClients[domain] = {});
+            qualifiedUserClients[domain][userId] = clients.map(client => client.id);
+        }));
+        return qualifiedUserClients;
     }
     async deleteMessageLocal(conversationId, messageIdToHide, sendAsProtobuf, conversationDomain) {
         const messageId = MessageBuilder_1.MessageBuilder.createId();
@@ -944,6 +924,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