@wireapp/core 29.1.5 → 29.2.0

package/CHANGELOG.md

@@ -3,6 +3,33 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [29.2.0](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/compare/@wireapp/core@29.1.7...@wireapp/core@29.2.0) (2022-08-16)
+
+
+### Features
+
+* Upgrade @otak/core-crypto from 0.3.0-beta-2 to 0.3.0 ([#4360](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/issues/4360)) ([87035a2](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/commit/87035a28856a28f32484791e193f8018ef69fd24))
+
+
+
+
+
+## [29.1.7](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/compare/@wireapp/core@29.1.6...@wireapp/core@29.1.7) (2022-08-11)
+
+**Note:** Version bump only for package @wireapp/core
+
+
+
+
+
+## [29.1.6](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/compare/@wireapp/core@29.1.5...@wireapp/core@29.1.6) (2022-08-11)
+
+**Note:** Version bump only for package @wireapp/core
+
+
+
+
+
 ## [29.1.5](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/compare/@wireapp/core@29.1.4...@wireapp/core@29.1.5) (2022-08-10)
 
 **Note:** Version bump only for package @wireapp/core

package/package.json

@@ -4,10 +4,10 @@
   },
   "dependencies": {
     "@open-wc/webpack-import-meta-loader": "0.4.7",
-    "@otak/core-crypto": "0.3.0-beta-2",
+    "@otak/core-crypto": "0.3.0-es2017",
     "@types/long": "4.0.1",
     "@types/node": "~14",
-    "@wireapp/api-client": "19.21.0",
+    "@wireapp/api-client": "19.21.2",
     "@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": "29.1.5",
-  "gitHead": "09e055edc240ed5a399123d11914db500f395e85"
+  "version": "29.2.0",
+  "gitHead": "7531f172591eda76341bee9dc2cdedca57f84a35"
 }

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

@@ -824,8 +824,10 @@ class ConversationService {
         if (memberAddedMessages === null || memberAddedMessages === void 0 ? void 0 : memberAddedMessages.welcome) {
             await this.apiClient.api.conversation.postMlsWelcomeMessage(Uint8Array.from(memberAddedMessages.welcome));
         }
-        if (memberAddedMessages === null || memberAddedMessages === void 0 ? void 0 : memberAddedMessages.message) {
-            return this.apiClient.api.conversation.postMlsMessage(Uint8Array.from(memberAddedMessages.message));
+        if (memberAddedMessages === null || memberAddedMessages === void 0 ? void 0 : memberAddedMessages.commit) {
+            const messageResponse = await this.apiClient.api.conversation.postMlsMessage(Uint8Array.from(memberAddedMessages.commit));
+            await coreCryptoClient.commitAccepted(groupIdDecodedFromBase64);
+            return messageResponse;
         }
         return null;
     }

package/src/main/notification/NotificationService.js

@@ -211,12 +211,11 @@ class NotificationService extends events_1.EventEmitter {
     async handleEvent(event, source, dryRun = false) {
         var _a;
         const coreCryptoClient = this.coreCryptoClientProvider();
+        if (!coreCryptoClient) {
+            throw new Error('Unable to access core crypto client');
+        }
         switch (event.type) {
             case Events.CONVERSATION_EVENT.MLS_WELCOME_MESSAGE:
-                if (!coreCryptoClient) {
-                    // TODO throw proper error
-                    throw new Error('TODO');
-                }
                 const data = bazinga64_1.Decoder.fromBase64(event.data).asBytes;
                 // We extract the groupId from the welcome message and let coreCrypto store this group
                 const newGroupId = await coreCryptoClient.processWelcomeMessage(data);
@@ -227,18 +226,17 @@ class NotificationService extends events_1.EventEmitter {
                     mappedEvent: ConversationMapper_1.ConversationMapper.mapConversationEvent(Object.assign(Object.assign({}, event), { data: groupIdStr }), source),
                 };
             case Events.CONVERSATION_EVENT.MLS_MESSAGE_ADD:
-                if (!coreCryptoClient) {
-                    // TODO throw proper error
-                    throw new Error('TODO');
-                }
                 const encryptedData = bazinga64_1.Decoder.fromBase64(event.data).asBytes;
                 const groupId = await this.getUint8ArrayFromConversationGroupId(event.qualified_conversation || { id: event.conversation, domain: '' });
                 const rawData = await coreCryptoClient.decryptMessage(groupId, encryptedData);
-                if (!rawData) {
-                    // TODO
-                    throw new Error('empty message');
+                if (!rawData.message) {
+                    throw new Error(`MLS message received from ${source} was empty`);
                 }
-                const decryptedData = protocol_messaging_1.GenericMessage.decode(rawData);
+                const decryptedData = protocol_messaging_1.GenericMessage.decode(rawData.message);
+                /**
+                 * @todo Find a proper solution to add mappedEvent to this return
+                 * otherwise event.data will be base64 raw data of the received event
+                 */
                 return { event, decryptedData };
             // Encrypted Proteus events
             case Events.CONVERSATION_EVENT.OTR_MESSAGE_ADD: {