@wireapp/core 31.3.4 → 31.3.6

package/package.json

@@ -3,7 +3,7 @@
     "./src/main/cryptography/AssetCryptography/crypto.node": "./src/main/cryptography/AssetCryptography/crypto.browser.js"
   },
   "dependencies": {
-    "@wireapp/api-client": "^20.6.3",
+    "@wireapp/api-client": "^20.6.4",
     "@wireapp/commons": "^4.4.6",
     "@wireapp/core-crypto": "0.5.2",
     "@wireapp/cryptobox": "12.8.0",
@@ -81,6 +81,6 @@
     "test": "jest",
     "watch": "tsc ---watch"
   },
-  "version": "31.3.4",
-  "gitHead": "65fc4d287cf2bb6239bba6835b641cb49f22c826"
+  "version": "31.3.6",
+  "gitHead": "4578099d3d63d9e9e28e43911c72168fb885e2b8"
 }

package/src/main/mls/MLSService/MLSService.d.ts

@@ -2,7 +2,6 @@ import { AddProposalArgs, ConversationConfiguration, ConversationId, CoreCrypto,
 import { APIClient } from '@wireapp/api-client';
 import { QualifiedUsers } from '../../conversation';
 import { MLSCallbacks, MLSConfig } from '../types';
-import { PostMlsMessageResponse } from '@wireapp/api-client/src/conversation';
 export declare const optionalToUint8Array: (array: Uint8Array | []) => Uint8Array;
 export declare class MLSService {
     readonly config: MLSConfig | undefined;
@@ -12,7 +11,7 @@ export declare class MLSService {
     constructor(config: MLSConfig | undefined, apiClient: APIClient, coreCryptoClientProvider: () => CoreCrypto | undefined);
     private getCoreCryptoClient;
     private uploadCommitBundle;
-    addUsersToExistingConversation(groupId: Uint8Array, invitee: Invitee[]): Promise<PostMlsMessageResponse | null>;
+    addUsersToExistingConversation(groupId: Uint8Array, invitee: Invitee[]): Promise<import("@wireapp/api-client/src/conversation").PostMlsMessageResponse | null>;
     configureMLSCallbacks({ groupIdFromConversationId, ...coreCryptoCallbacks }: MLSCallbacks): void;
     getKeyPackagesPayload(qualifiedUsers: QualifiedUsers[]): Promise<Invitee[]>;
     newProposal(proposalType: ProposalType, args: ProposalArgs | AddProposalArgs | RemoveProposalArgs): Promise<import("@wireapp/core-crypto").ProposalBundle>;
@@ -20,9 +19,20 @@ export declare class MLSService {
     processWelcomeMessage(welcomeMessage: Uint8Array): Promise<ConversationId>;
     decryptMessage(conversationId: ConversationId, payload: Uint8Array): Promise<DecryptedMessage>;
     encryptMessage(conversationId: ConversationId, message: Uint8Array): Promise<Uint8Array>;
-    updateKeyingMaterial(conversationId: ConversationId): Promise<PostMlsMessageResponse | null>;
+    /**
+     * Will wrap a coreCrypto call that generates a CommitBundle and do all the necessary work so that commitbundle is handled the right way.
+     * It does:
+     *   - commit the pending proposal
+     *   - then generates the commitBundle with the given function
+     *   - uploads the commitBundle to backend
+     *   - warns coreCrypto that the commit was successfully processed
+     * @param groupId
+     * @param generateCommit The function that will generate a coreCrypto CommitBundle
+     */
+    private processCommitAction;
+    updateKeyingMaterial(conversationId: ConversationId): Promise<import("@wireapp/api-client/src/conversation").PostMlsMessageResponse | null>;
     createConversation(conversationId: ConversationId, configuration?: ConversationConfiguration): Promise<any>;
-    removeClientsFromConversation(conversationId: ConversationId, clientIds: Uint8Array[]): Promise<PostMlsMessageResponse | null>;
+    removeClientsFromConversation(conversationId: ConversationId, clientIds: Uint8Array[]): Promise<import("@wireapp/api-client/src/conversation").PostMlsMessageResponse | null>;
     commitPendingProposals(groupId: ConversationId): Promise<void>;
     conversationExists(conversationId: ConversationId): Promise<boolean>;
     clientValidKeypackagesCount(): Promise<number>;

package/src/main/mls/MLSService/MLSService.js

@@ -74,11 +74,7 @@ class MLSService {
         return null;
     }
     addUsersToExistingConversation(groupId, invitee) {
-        return (0, messageSender_1.sendMessage)(async () => {
-            const coreCryptoClient = this.getCoreCryptoClient();
-            const memberAddedMessages = await coreCryptoClient.addClientsToConversation(groupId, invitee);
-            return this.uploadCommitBundle(groupId, memberAddedMessages);
-        });
+        return this.processCommitAction(groupId, () => this.getCoreCryptoClient().addClientsToConversation(groupId, invitee));
     }
     configureMLSCallbacks(_a) {
         var { groupIdFromConversationId } = _a, coreCryptoCallbacks = __rest(_a, ["groupIdFromConversationId"]);
@@ -131,24 +127,35 @@ class MLSService {
     async encryptMessage(conversationId, message) {
         return this.getCoreCryptoClient().encryptMessage(conversationId, message);
     }
-    updateKeyingMaterial(conversationId) {
+    /**
+     * Will wrap a coreCrypto call that generates a CommitBundle and do all the necessary work so that commitbundle is handled the right way.
+     * It does:
+     *   - commit the pending proposal
+     *   - then generates the commitBundle with the given function
+     *   - uploads the commitBundle to backend
+     *   - warns coreCrypto that the commit was successfully processed
+     * @param groupId
+     * @param generateCommit The function that will generate a coreCrypto CommitBundle
+     */
+    async processCommitAction(groupId, generateCommit) {
         return (0, messageSender_1.sendMessage)(async () => {
-            const commitBundle = await this.getCoreCryptoClient().updateKeyingMaterial(conversationId);
-            return this.uploadCommitBundle(conversationId, commitBundle);
+            await this.commitPendingProposals(groupId);
+            const commitBundle = await generateCommit();
+            return this.uploadCommitBundle(groupId, commitBundle);
         });
     }
+    updateKeyingMaterial(conversationId) {
+        return this.processCommitAction(conversationId, () => this.getCoreCryptoClient().updateKeyingMaterial(conversationId));
+    }
     async createConversation(conversationId, configuration) {
         return this.getCoreCryptoClient().createConversation(conversationId, configuration);
     }
     removeClientsFromConversation(conversationId, clientIds) {
-        return (0, messageSender_1.sendMessage)(async () => {
-            const commitBundle = await this.getCoreCryptoClient().removeClientsFromConversation(conversationId, clientIds);
-            return this.uploadCommitBundle(conversationId, commitBundle);
-        });
+        return this.processCommitAction(conversationId, () => this.getCoreCryptoClient().removeClientsFromConversation(conversationId, clientIds));
     }
     async commitPendingProposals(groupId) {
         const commitBundle = await this.getCoreCryptoClient().commitPendingProposals(groupId);
-        return commitBundle ? void this.uploadCommitBundle(groupId, commitBundle) : undefined;
+        return commitBundle ? void (await this.uploadCommitBundle(groupId, commitBundle)) : undefined;
     }
     async conversationExists(conversationId) {
         return this.getCoreCryptoClient().conversationExists(conversationId);