@wireapp/core 46.24.1 → 46.24.2

package/lib/messagingProtocols/mls/E2EIdentityService/E2EIServiceInternal.d.ts

@@ -6,9 +6,6 @@ export type getTokenCallback = (challengesData?: {
     challenge: any;
     keyAuth: string;
 }) => Promise<string | undefined>;
-export type getAllConversationsCallback = () => Promise<{
-    group_id: string;
-}[]>;
 export declare class E2EIServiceInternal {
     private readonly coreCryptoClient;
     private readonly apiClient;
@@ -27,10 +24,7 @@ export declare class E2EIServiceInternal {
      * @param getOAuthToken function called when the process needs an oauth token
      * @param refresh should the process refresh the current certificate or get a new one
      */
-    generateCertificate(getOAuthToken: getTokenCallback, refresh: boolean, getAllConversations: getAllConversationsCallback, ciphersuite: Ciphersuite): Promise<{
-        newCrlDistributionPoints: import("@wireapp/core-crypto").NewCrlDistributionPoints;
-        keyPackages: Uint8Array[];
-    }>;
+    generateCertificate(getOAuthToken: getTokenCallback, refresh: boolean, ciphersuite: Ciphersuite): Promise<import("@wireapp/core-crypto").RotateBundle>;
     private continueCertificateGeneration;
     private initIdentity;
     private getDirectory;
@@ -48,8 +42,8 @@ export declare class E2EIServiceInternal {
      * Stores the received certificate data in local storage for later use
      *
      * @param oAuthIdToken
-     * @returns KeyPackages
+     * @returns RotateBundle
      */
-    private getKeyPackages;
+    private getRotateBundle;
 }
 //# sourceMappingURL=E2EIServiceInternal.d.ts.map

package/lib/messagingProtocols/mls/E2EIdentityService/E2EIServiceInternal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"E2EIServiceInternal.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/mls/E2EIdentityService/E2EIServiceInternal.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAI9C,OAAO,EAAgB,WAAW,EAAE,UAAU,EAAiC,MAAM,qBAAqB,CAAC;AAS3G,OAAO,EAAqB,WAAW,EAAiC,MAAM,8BAA8B,CAAC;AAE7G,OAAO,EAAC,YAAY,EAAC,MAAM,yBAAyB,CAAC;AAErD,MAAM,MAAM,gBAAgB,GAAG,CAAC,cAAc,CAAC,EAAE;IAAC,SAAS,EAAE,GAAG,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAC,KAAK,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;AAEnH,MAAM,MAAM,2BAA2B,GAAG,MAAM,OAAO,CACrD;IACE,QAAQ,EAAE,MAAM,CAAC;CAClB,EAAE,CACJ,CAAC;AACF,qBAAa,mBAAmB;IAO5B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,wDAAwD;IACxD,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,WAAW;IAX9B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAoE;IAC3F,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,iBAAiB,CAAiD;gBAGxE,MAAM,EAAE,YAAY,EACH,gBAAgB,EAAE,UAAU,EAC5B,SAAS,EAAE,SAAS;IACrC,wDAAwD;IACvC,cAAc,EAAE,MAAM,EACtB,iBAAiB,EAAE,MAAM,EACzB,WAAW,EAAE,WAAW;IAO3C;;;;OAIG;IACU,mBAAmB,CAC9B,aAAa,EAAE,gBAAgB,EAC/B,OAAO,EAAE,OAAO,EAChB,mBAAmB,EAAE,2BAA2B,EAChD,WAAW,EAAE,WAAW;;;;YAoCZ,6BAA6B;YAa7B,YAAY;YAYZ,YAAY;YAUZ,eAAe;IAQ7B;;;;;OAKG;YACW,uBAAuB;IAyCrC;;;;;;;OAOG;YACW,cAAc;CAoF7B"}
+{"version":3,"file":"E2EIServiceInternal.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/mls/E2EIdentityService/E2EIServiceInternal.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAI9C,OAAO,EAAgB,WAAW,EAAE,UAAU,EAAiB,MAAM,qBAAqB,CAAC;AAS3F,OAAO,EAAqB,WAAW,EAAiC,MAAM,8BAA8B,CAAC;AAE7G,OAAO,EAAC,YAAY,EAAC,MAAM,yBAAyB,CAAC;AAErD,MAAM,MAAM,gBAAgB,GAAG,CAAC,cAAc,CAAC,EAAE;IAAC,SAAS,EAAE,GAAG,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAC,KAAK,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;AACnH,qBAAa,mBAAmB;IAO5B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,wDAAwD;IACxD,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,WAAW;IAX9B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAoE;IAC3F,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,iBAAiB,CAAiD;gBAGxE,MAAM,EAAE,YAAY,EACH,gBAAgB,EAAE,UAAU,EAC5B,SAAS,EAAE,SAAS;IACrC,wDAAwD;IACvC,cAAc,EAAE,MAAM,EACtB,iBAAiB,EAAE,MAAM,EACzB,WAAW,EAAE,WAAW;IAO3C;;;;OAIG;IACU,mBAAmB,CAAC,aAAa,EAAE,gBAAgB,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,WAAW;YAkC9F,6BAA6B;YAQ7B,YAAY;YAoBZ,YAAY;YAUZ,eAAe;IAQ7B;;;;;OAKG;YACW,uBAAuB;IAyCrC;;;;;;;OAOG;YACW,eAAe;CAgE9B"}

package/lib/messagingProtocols/mls/E2EIdentityService/E2EIServiceInternal.js

@@ -21,7 +21,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.E2EIServiceInternal = void 0;
 const commons_1 = require("@wireapp/commons");
 const AcmeServer_1 = require("./Connection/AcmeServer");
-const E2EIService_types_1 = require("./E2EIService.types");
 const Helper_1 = require("./Helper");
 const Account_1 = require("./Steps/Account");
 const Authorization_1 = require("./Steps/Authorization");
@@ -56,7 +55,7 @@ class E2EIServiceInternal {
      * @param getOAuthToken function called when the process needs an oauth token
      * @param refresh should the process refresh the current certificate or get a new one
      */
-    async generateCertificate(getOAuthToken, refresh, getAllConversations, ciphersuite) {
+    async generateCertificate(getOAuthToken, refresh, ciphersuite) {
         const stashedEnrollmentData = await this.enrollmentStorage.getPendingEnrollmentData();
         if (stashedEnrollmentData) {
             // In case we have stashed data, we continue the enrollment flow (we are coming back from a redirect)
@@ -64,7 +63,7 @@ class E2EIServiceInternal {
             if (!oAuthToken) {
                 throw new Error('No OAuthToken received for in progress enrollment process');
             }
-            return this.continueCertificateGeneration(oAuthToken, stashedEnrollmentData, getAllConversations, ciphersuite);
+            return this.continueCertificateGeneration(oAuthToken, stashedEnrollmentData);
         }
         // We first get the challenges needed to validate the user identity
         const identity = await this.initIdentity(refresh, ciphersuite);
@@ -72,7 +71,7 @@ class E2EIServiceInternal {
         const { keyauth, oidcChallenge } = enrollmentChallenges.authorization;
         const challengeData = { challenge: oidcChallenge, keyAuth: keyauth };
         // store auth data for continuing the flow later on (in case we are redirected to the identity provider)
-        const handle = await this.coreCryptoClient.transaction(cx => cx.e2eiEnrollmentStash(identity));
+        const handle = await this.coreCryptoClient.e2eiEnrollmentStash(identity);
         const enrollmentData = {
             handle,
             ...enrollmentChallenges,
@@ -83,19 +82,19 @@ class E2EIServiceInternal {
         if (!oAuthToken) {
             throw new Error('No OAuthToken received for in initial enrollment process');
         }
-        return this.continueCertificateGeneration(oAuthToken, enrollmentData, getAllConversations, ciphersuite);
+        return this.continueCertificateGeneration(oAuthToken, enrollmentData);
     }
-    async continueCertificateGeneration(oAuthToken, enrollmentData, getAllConversations, cipherSuite) {
+    async continueCertificateGeneration(oAuthToken, enrollmentData) {
         const handle = enrollmentData.handle;
-        const identity = await this.coreCryptoClient.transaction(cx => cx.e2eiEnrollmentStashPop(handle));
-        return this.getKeyPackages(identity, oAuthToken, enrollmentData, getAllConversations, cipherSuite);
+        const identity = await this.coreCryptoClient.e2eiEnrollmentStashPop(handle);
+        return this.getRotateBundle(identity, oAuthToken, enrollmentData);
     }
     // ############ Internal Functions ############
     async initIdentity(hasActiveCertificate, ciphersuite) {
         const { user } = this.initialData;
         return hasActiveCertificate
-            ? this.coreCryptoClient.transaction(cx => cx.e2eiNewRotateEnrollment(this.certificateTtl, ciphersuite, user.displayName, user.handle, user.teamId))
-            : this.coreCryptoClient.transaction(cx => cx.e2eiNewActivationEnrollment(user.displayName, user.handle, this.certificateTtl, ciphersuite, user.teamId));
+            ? this.coreCryptoClient.e2eiNewRotateEnrollment(this.certificateTtl, ciphersuite, user.displayName, user.handle, user.teamId)
+            : this.coreCryptoClient.e2eiNewActivationEnrollment(user.displayName, user.handle, this.certificateTtl, ciphersuite, user.teamId);
     }
     async getDirectory(identity, connection) {
         const directory = await connection.getDirectory();
@@ -159,9 +158,9 @@ class E2EIServiceInternal {
      * Stores the received certificate data in local storage for later use
      *
      * @param oAuthIdToken
-     * @returns KeyPackages
+     * @returns RotateBundle
      */
-    async getKeyPackages(identity, oAuthIdToken, enrollmentData, getAllConversations, cipherSuite) {
+    async getRotateBundle(identity, oAuthIdToken, enrollmentData) {
         // Step 7: Do OIDC client challenge
         const oidcData = await (0, OidcChallenge_1.doWireOidcChallenge)({
             oAuthIdToken,
@@ -211,24 +210,7 @@ class E2EIServiceInternal {
             throw new Error('Error while trying to continue OAuth flow. No certificate received');
         }
         // Step 10: Initialize MLS with the certificate
-        return this.coreCryptoClient.transaction(async (cx) => {
-            const conversations = await getAllConversations();
-            const newCrlDistributionPoints = await cx.saveX509Credential(identity, certificate);
-            for (const conversation of conversations) {
-                if (Boolean(conversation.group_id?.length)) {
-                    const idAsBytes = new TextEncoder().encode(conversation.group_id);
-                    await cx.e2eiRotate(idAsBytes);
-                }
-                else {
-                    this.logger.error('No group id found in conversation');
-                }
-            }
-            const keyPackages = await cx.clientKeypackages(cipherSuite, E2EIService_types_1.CredentialType.X509, this.keyPackagesAmount);
-            return {
-                newCrlDistributionPoints,
-                keyPackages,
-            };
-        });
+        return this.coreCryptoClient.e2eiRotateAll(identity, certificate, this.keyPackagesAmount);
     }
 }
 exports.E2EIServiceInternal = E2EIServiceInternal;

package/lib/messagingProtocols/mls/EventHandler/events/messageAdd/messageAdd.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"messageAdd.d.ts","sourceRoot":"","sources":["../../../../../../src/messagingProtocols/mls/EventHandler/events/messageAdd/messageAdd.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,8BAA8B,EAAC,MAAM,+BAA+B,CAAC;AAK7E,OAAO,EAAC,mBAAmB,EAAC,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAC,UAAU,EAAyC,MAAM,gCAAgC,CAAC;AAElG,UAAU,yBAAyB;IACjC,KAAK,EAAE,8BAA8B,CAAC;IACtC,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,UAAU,CAAC;CACxB;AAED,eAAO,MAAM,mBAAmB,oCAI7B,yBAAyB,KAAG,OAAO,CAAC,mBAAmB,GAAG,IAAI,CAqChE,CAAC"}
+{"version":3,"file":"messageAdd.d.ts","sourceRoot":"","sources":["../../../../../../src/messagingProtocols/mls/EventHandler/events/messageAdd/messageAdd.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,8BAA8B,EAAC,MAAM,+BAA+B,CAAC;AAK7E,OAAO,EAAC,mBAAmB,EAAC,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAC,UAAU,EAAyC,MAAM,gCAAgC,CAAC;AAElG,UAAU,yBAAyB;IACjC,KAAK,EAAE,8BAA8B,CAAC;IACtC,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,UAAU,CAAC;CACxB;AAED,eAAO,MAAM,mBAAmB,oCAI7B,yBAAyB,KAAG,OAAO,CAAC,mBAAmB,GAAG,IAAI,CAoChE,CAAC"}

package/lib/messagingProtocols/mls/EventHandler/events/messageAdd/messageAdd.js

@@ -25,19 +25,14 @@ const MLSService_1 = require("../../../MLSService/MLSService");
 const handleMLSMessageAdd = async ({ event, groupId, mlsService, }) => {
     const encryptedData = bazinga64_1.Decoder.fromBase64(event.data).asBytes;
     const groupIdBytes = bazinga64_1.Decoder.fromBase64(groupId).asBytes;
-    const decryptedMessage = await mlsService.decryptMessage(groupIdBytes, encryptedData);
-    if (!decryptedMessage) {
-        // If the message is not decrypted, we return null
-        return null;
-    }
-    const { message, commitDelay, hasEpochChanged, senderClientId: encodedSenderClientId } = decryptedMessage;
+    const { proposals, commitDelay, message, senderClientId: encodedSenderClientId, hasEpochChanged, } = await mlsService.decryptMessage(groupIdBytes, encryptedData);
     if (encodedSenderClientId) {
         const decoder = new TextDecoder();
         const senderClientId = decoder.decode((0, MLSService_1.optionalToUint8Array)(encodedSenderClientId));
         event.senderClientId = senderClientId;
     }
     // Check if the message includes proposals
-    if (typeof commitDelay === 'number') {
+    if (typeof commitDelay === 'number' || proposals.length > 0) {
         // we are dealing with a proposal, add a task to process this proposal later on
         // Those proposals are stored inside of coreCrypto and will be handled after a timeout
         await mlsService.handlePendingProposals({

package/lib/messagingProtocols/mls/EventHandler/events/messageAdd/messageAdd.test.js

@@ -45,11 +45,45 @@ const createMockedMessage = () => {
     })).finish();
 };
 describe('handleMLSMessageAdd', () => {
+    it('does not handle pending proposals if message does not contain proposals', async () => {
+        const event = createMLSMessageAddEventMock({ id: 'conversationId', domain: 'staging.zinfra.io' });
+        const mockGroupId = 'AAEAAH87aajaQ011i+rNLmwpy0sAZGl5YS53aXJlLmxpbms=';
+        const message = createMockedMessage();
+        jest.spyOn(mockedMLSService, 'decryptMessage').mockResolvedValueOnce({
+            proposals: [],
+            commitDelay: undefined,
+            message,
+            hasEpochChanged: false,
+            isActive: true,
+        });
+        await (0, messageAdd_1.handleMLSMessageAdd)({ event, mlsService: mockedMLSService, groupId: mockGroupId });
+        expect(mockedMLSService.handlePendingProposals).not.toHaveBeenCalled();
+    });
+    it('handles pending proposals if message includes proposals', async () => {
+        const event = createMLSMessageAddEventMock({ id: 'conversationId', domain: 'staging.zinfra.io' });
+        const mockGroupId = 'AAEAAH87aajaQ011i+rNLmwpy0sAZGl5YS53aXJlLmxpbms=';
+        const message = createMockedMessage();
+        jest.spyOn(mockedMLSService, 'decryptMessage').mockResolvedValueOnce({
+            proposals: [{ proposal: new Uint8Array(), proposalRef: new Uint8Array(), crlNewDistributionPoints: [] }],
+            commitDelay: 2000,
+            crlNewDistributionPoints: [],
+            message,
+            hasEpochChanged: false,
+            isActive: true,
+        });
+        await (0, messageAdd_1.handleMLSMessageAdd)({ event, mlsService: mockedMLSService, groupId: mockGroupId });
+        expect(mockedMLSService.handlePendingProposals).toHaveBeenCalledWith({
+            groupId: mockGroupId,
+            delayInMs: 2000,
+            eventTime: event.time,
+        });
+    });
     it('emits "newEpoch" event if incoming message has advanced epoch number', async () => {
         const event = createMLSMessageAddEventMock({ id: 'conversationId', domain: 'staging.zinfra.io' });
         const mockGroupId = 'AAEAAH87aajaQ011i+rNLmwpy0sAZGl5YS53aXJlLmxpbms=';
         const message = createMockedMessage();
         jest.spyOn(mockedMLSService, 'decryptMessage').mockResolvedValueOnce({
+            proposals: [],
             message,
             hasEpochChanged: true,
             isActive: true,

package/lib/messagingProtocols/mls/EventHandler/events/welcomeMessage/welcomeMessage.test.js

@@ -20,7 +20,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const event_1 = require("@wireapp/api-client/lib/event");
 const welcomeMessage_1 = require("./welcomeMessage");
-const MLSService_1 = require("../../../MLSService");
+const __1 = require("../../..");
 jest.mock('bazinga64', () => ({
     ...jest.requireActual('bazinga64'),
     Decoder: {
@@ -62,7 +62,7 @@ describe('MLS welcomeMessage eventHandler', () => {
         it('emits new epoch event after processing a welcome message', async () => {
             jest.spyOn(mockParams.mlsService, 'getEpoch').mockResolvedValue(1);
             await (0, welcomeMessage_1.handleMLSWelcomeMessage)(mockParams);
-            expect(mockParams.mlsService.emit).toHaveBeenCalledWith(MLSService_1.MLSServiceEvents.NEW_EPOCH, {
+            expect(mockParams.mlsService.emit).toHaveBeenCalledWith(__1.MLSServiceEvents.NEW_EPOCH, {
                 groupId: 'conversationId',
                 epoch: 1,
             });

package/lib/messagingProtocols/mls/MLSService/MLSService.d.ts

@@ -1,15 +1,15 @@
 import type { MLSPublicKeyRecord, RegisteredClient } from '@wireapp/api-client/lib/client';
-import { SUBCONVERSATION_ID } from '@wireapp/api-client/lib/conversation';
+import { PostMlsMessageResponse, SUBCONVERSATION_ID } from '@wireapp/api-client/lib/conversation';
 import { ConversationMLSMessageAddEvent, ConversationMLSWelcomeEvent } from '@wireapp/api-client/lib/event';
 import { QualifiedId } from '@wireapp/api-client/lib/user';
 import { APIClient } from '@wireapp/api-client';
 import { TypedEventEmitter } from '@wireapp/commons';
-import { Ciphersuite, ConversationId, CoreCrypto, DecryptedMessage } from '@wireapp/core-crypto';
+import { AddProposalArgs, Ciphersuite, ConversationId, CoreCrypto, DecryptedMessage, ProposalArgs, ProposalType, RemoveProposalArgs } from '@wireapp/core-crypto';
 import { AddUsersFailure, KeyPackageClaimUser } from '../../../conversation';
 import { CoreDatabase } from '../../../storage/CoreDB';
 import { RecurringTaskScheduler } from '../../../util/RecurringTaskScheduler';
 import { User } from '../E2EIdentityService';
-import { getAllConversationsCallback, getTokenCallback } from '../E2EIdentityService/E2EIServiceInternal';
+import { getTokenCallback } from '../E2EIdentityService/E2EIServiceInternal';
 import { ClientId, HandlePendingProposalsParams } from '../types';
 type Optional<T, K extends keyof T> = Pick<Partial<T>, K> & Omit<T, K>;
 interface MLSConfig {
@@ -33,8 +33,7 @@ export declare const optionalToUint8Array: (array: Uint8Array | []) => Uint8Arra
 export declare enum MLSServiceEvents {
     NEW_EPOCH = "newEpoch",
     MLS_CLIENT_MISMATCH = "mlsClientMismatch",
-    NEW_CRL_DISTRIBUTION_POINTS = "newCrlDistributionPoints",
-    MLS_EVENT_DISTRIBUTED = "mlsEventDistributed"
+    NEW_CRL_DISTRIBUTION_POINTS = "newCrlDistributionPoints"
 }
 type Events = {
     [MLSServiceEvents.NEW_EPOCH]: {
@@ -43,10 +42,6 @@ type Events = {
     };
     [MLSServiceEvents.NEW_CRL_DISTRIBUTION_POINTS]: string[];
     [MLSServiceEvents.MLS_CLIENT_MISMATCH]: void;
-    [MLSServiceEvents.MLS_EVENT_DISTRIBUTED]: {
-        events: any;
-        time: string;
-    };
 };
 export declare class MLSService extends TypedEventEmitter<Events> {
     private readonly apiClient;
@@ -57,6 +52,7 @@ export declare class MLSService extends TypedEventEmitter<Events> {
     private _config?;
     private readonly textEncoder;
     private readonly textDecoder;
+    private readonly conflictBackoffQueue;
     constructor(apiClient: APIClient, coreCryptoClient: CoreCrypto, coreDatabase: CoreDatabase, recurringTaskScheduler: RecurringTaskScheduler);
     /**
      * return true if the MLS service if configured and ready to be used
@@ -77,6 +73,7 @@ export declare class MLSService extends TypedEventEmitter<Events> {
      */
     isInitializedMLSClient: (client: RegisteredClient) => boolean;
     private getCredentialType;
+    private uploadCommitBundle;
     private readonly _uploadCommitBundle;
     /**
      * Will add users to an existing MLS group and send a commit bundle to backend.
@@ -85,7 +82,9 @@ export declare class MLSService extends TypedEventEmitter<Events> {
      * @param groupId - the group id of the MLS group
      * @param keyPackages - the list of keys of clients to add to the MLS group
      */
-    addUsersToExistingConversation(groupId: string, keyPackages: Uint8Array[]): Promise<void>;
+    addUsersToExistingConversation(groupId: string, keyPackages: Uint8Array[]): Promise<PostMlsMessageResponse & {
+        failures: AddUsersFailure[];
+    }>;
     /**
      * Will return a list of client ids which are already in the group at core crypto level
      *
@@ -98,12 +97,24 @@ export declare class MLSService extends TypedEventEmitter<Events> {
         failures: AddUsersFailure[];
     }>;
     getEpoch(groupId: string | Uint8Array): Promise<number>;
-    joinByExternalCommit(getGroupInfo: () => Promise<Uint8Array>): Promise<void>;
+    newProposal(proposalType: ProposalType, args: ProposalArgs | AddProposalArgs | RemoveProposalArgs): Promise<import("@wireapp/core-crypto").ProposalBundle>;
+    joinByExternalCommit(getGroupInfo: () => Promise<Uint8Array>): Promise<PostMlsMessageResponse>;
     exportSecretKey(groupId: string, keyLength: number): Promise<string>;
     private dispatchNewCrlDistributionPoints;
     processWelcomeMessage(welcomeMessage: Uint8Array): Promise<ConversationId>;
-    decryptMessage(conversationId: ConversationId, payload: Uint8Array): Promise<DecryptedMessage | undefined>;
+    decryptMessage(conversationId: ConversationId, payload: Uint8Array): Promise<DecryptedMessage>;
     encryptMessage(conversationId: ConversationId, message: Uint8Array): Promise<Uint8Array>;
+    /**
+     * 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;
     private updateKeyingMaterial;
     /**
      * Will create an empty conversation inside of coreCrypto.
@@ -124,7 +135,9 @@ export declare class MLSService extends TypedEventEmitter<Events> {
             client?: string;
         };
         parentGroupId?: string;
-    }): Promise<AddUsersFailure[]>;
+    }): Promise<PostMlsMessageResponse & {
+        failures: AddUsersFailure[];
+    }>;
     /**
      * Will create a 1:1 conversation inside of coreCrypto, try claiming key packages for user and (if succesfull) add them to the MLS group.
      * @param groupId the id of the group to create inside of coreCrypto
@@ -134,7 +147,9 @@ export declare class MLSService extends TypedEventEmitter<Events> {
     register1to1Conversation(groupId: string, userId: QualifiedId, selfUser: {
         user: QualifiedId;
         client: string;
-    }, removalKeyFor1to1Signature?: MLSPublicKeyRecord): Promise<AddUsersFailure[]>;
+    }, removalKeyFor1to1Signature?: MLSPublicKeyRecord): Promise<PostMlsMessageResponse & {
+        failures: AddUsersFailure[];
+    }>;
     /**
      * Will try to register mls group and send an empty commit to establish it.
      *
@@ -147,7 +162,7 @@ export declare class MLSService extends TypedEventEmitter<Events> {
      * @param groupId groupId of the conversation
      * @param clientIds the list of **qualified** ids of the clients we want to remove from the group
      */
-    removeClientsFromConversation(groupId: string, clientIds: ClientId[]): Promise<void>;
+    removeClientsFromConversation(groupId: string, clientIds: ClientId[]): Promise<PostMlsMessageResponse>;
     /**
      * Will check if mls group exists in corecrypto.
      * @param groupId groupId of the conversation
@@ -258,7 +273,7 @@ export declare class MLSService extends TypedEventEmitter<Events> {
      * @param oAuthIdToken The OAuth id token if the user is already authenticated
      * @returns AcmeChallenge if the user is not authenticated, true if the user is authenticated
      */
-    enrollE2EI(discoveryUrl: string, user: User, client: RegisteredClient, nbPrekeys: number, certificateTtl: number, getOAuthToken: getTokenCallback, getAllConversations: getAllConversationsCallback): Promise<void>;
+    enrollE2EI(discoveryUrl: string, user: User, client: RegisteredClient, nbPrekeys: number, certificateTtl: number, getOAuthToken: getTokenCallback): Promise<void>;
 }
 export {};
 //# sourceMappingURL=MLSService.d.ts.map

package/lib/messagingProtocols/mls/MLSService/MLSService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MLSService.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/mls/MLSService/MLSService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"MLSService.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/mls/MLSService/MLSService.ts"],"names":[],"mappings":"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"}