@wireapp/core 40.5.3-draft-20-cc.0 → 40.5.3

package/lib/conversation/ConversationService/ConversationService.d.ts

@@ -74,7 +74,7 @@ export declare class ConversationService {
      */
     addUsersToMLSConversation({ qualifiedUsers, groupId, conversationId, }: Required<AddUsersParams>): Promise<MLSReturnType>;
     removeUsersFromMLSConversation({ groupId, conversationId, qualifiedUserIds, }: RemoveUsersParams): Promise<MLSReturnType>;
-    joinByExternalCommit(conversationId: QualifiedId): Promise<PostMlsMessageResponse | null>;
+    joinByExternalCommit(conversationId: QualifiedId): Promise<PostMlsMessageResponse>;
     /**
      * 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

package/lib/conversation/ConversationService/ConversationService.js

@@ -156,7 +156,6 @@ class ConversationService {
      * @param conversationData
      */
     async createMLSConversation(conversationData, selfUserId, selfClientId) {
-        var _a;
         const { qualified_users: qualifiedUsers = [] } = conversationData;
         /**
          * @note For creating MLS conversations the users & qualified_users
@@ -175,7 +174,7 @@ class ConversationService {
         // We fetch the fresh version of the conversation created on backend with the newly added users
         const conversation = await this.apiClient.api.conversation.getConversation(qualifiedId);
         return {
-            events: (_a = response === null || response === void 0 ? void 0 : response.events) !== null && _a !== void 0 ? _a : [],
+            events: response.events,
             conversation,
         };
     }
@@ -220,7 +219,7 @@ class ConversationService {
         //We store the info when user was added (and key material was created), so we will know when to renew it
         this.mlsService.resetKeyMaterialRenewal(groupId);
         return {
-            events: (response === null || response === void 0 ? void 0 : response.events) || [],
+            events: response.events,
             conversation,
         };
     }
@@ -232,7 +231,7 @@ class ConversationService {
         this.mlsService.resetKeyMaterialRenewal(groupId);
         const conversation = await this.getConversation(conversationId);
         return {
-            events: (messageResponse === null || messageResponse === void 0 ? void 0 : messageResponse.events) || [],
+            events: messageResponse.events,
             conversation,
         };
     }

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

@@ -3,7 +3,7 @@ import { Subconversation } from '@wireapp/api-client/lib/conversation/Subconvers
 import { QualifiedId } from '@wireapp/api-client/lib/user';
 import logdown from 'logdown';
 import { APIClient } from '@wireapp/api-client';
-import { AddProposalArgs, ConversationId, CoreCrypto, DecryptedMessage, ExternalAddProposalArgs, ExternalProposalType, Invitee, ProposalArgs, ProposalType, RemoveProposalArgs } from '@wireapp/core-crypto';
+import { AddProposalArgs, ConversationId, CoreCrypto, DecryptedMessage, ExternalAddProposalArgs, ExternalProposalType, ExternalRemoveProposalArgs, Invitee, ProposalArgs, ProposalType, RemoveProposalArgs } from '@wireapp/core-crypto';
 import { MLSServiceConfig } from './MLSService.types';
 import { KeyPackageClaimUser } from '../../../conversation';
 import { TypedEventEmitter } from '../../../util/TypedEventEmitter';
@@ -30,17 +30,23 @@ export declare class MLSService extends TypedEventEmitter<Events> {
     groupIdFromConversationId?: MLSCallbacks['groupIdFromConversationId'];
     private readonly textEncoder;
     private readonly textDecoder;
-    private readonly defaultCiphersuite;
     constructor(apiClient: APIClient, coreCryptoClient: CoreCrypto, { keyingMaterialUpdateThreshold, nbKeyPackages, }: Partial<MLSServiceConfig>);
     initClient(userId: QualifiedId, clientId: string): Promise<void>;
     createClient(userId: QualifiedId, clientId: string): Promise<void>;
     private uploadCommitBundle;
-    addUsersToExistingConversation(groupId: Uint8Array, invitee: Invitee[]): Promise<PostMlsMessageResponse | null> | null;
+    /**
+     * Will add users to an existing MLS group and send a commit bundle to backend.
+     * Cannot be called with an empty array of keys.
+     *
+     * @param groupId - the group id of the MLS group
+     * @param invitee - the list of keys of clients to add to the MLS group
+     */
+    addUsersToExistingConversation(groupId: Uint8Array, invitee: Invitee[]): Promise<PostMlsMessageResponse>;
     configureMLSCallbacks({ groupIdFromConversationId, ...coreCryptoCallbacks }: MLSCallbacks): void;
     getKeyPackagesPayload(qualifiedUsers: KeyPackageClaimUser[]): Promise<Invitee[]>;
     getEpoch(groupId: string | Uint8Array): Promise<number>;
     newProposal(proposalType: ProposalType, args: ProposalArgs | AddProposalArgs | RemoveProposalArgs): Promise<import("@wireapp/core-crypto").ProposalBundle>;
-    joinByExternalCommit(getGroupInfo: () => Promise<Uint8Array>): Promise<PostMlsMessageResponse | null>;
+    joinByExternalCommit(getGroupInfo: () => Promise<Uint8Array>): Promise<PostMlsMessageResponse>;
     getConferenceSubconversation(conversationId: QualifiedId): Promise<Subconversation>;
     private deleteConferenceSubconversation;
     /**
@@ -61,7 +67,7 @@ export declare class MLSService extends TypedEventEmitter<Events> {
         epoch: number;
     }>;
     exportSecretKey(groupId: string, keyLength: number): Promise<string>;
-    newExternalProposal(externalProposalType: ExternalProposalType, args: ExternalAddProposalArgs): Promise<Uint8Array>;
+    newExternalProposal(externalProposalType: ExternalProposalType, args: ExternalAddProposalArgs | ExternalRemoveProposalArgs): Promise<Uint8Array>;
     processWelcomeMessage(welcomeMessage: Uint8Array): Promise<ConversationId>;
     decryptMessage(conversationId: ConversationId, payload: Uint8Array): Promise<DecryptedMessage>;
     encryptMessage(conversationId: ConversationId, message: Uint8Array): Promise<Uint8Array>;
@@ -76,7 +82,7 @@ export declare class MLSService extends TypedEventEmitter<Events> {
      * @param generateCommit The function that will generate a coreCrypto CommitBundle
      */
     private processCommitAction;
-    updateKeyingMaterial(conversationId: ConversationId): Promise<PostMlsMessageResponse | null>;
+    updateKeyingMaterial(conversationId: ConversationId): Promise<PostMlsMessageResponse>;
     /**
      * Will create a conversation inside of coreCrypto.
      * @param groupId the id of the group to create inside of coreCrypto
@@ -86,13 +92,13 @@ export declare class MLSService extends TypedEventEmitter<Events> {
     registerConversation(groupId: string, users: QualifiedId[], creator?: {
         user: QualifiedId;
         client?: string;
-    }): Promise<PostMlsMessageResponse | null | undefined>;
+    }): Promise<PostMlsMessageResponse>;
     /**
      * Will send a removal commit for given clients
      * @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: string[]): Promise<PostMlsMessageResponse | null>;
+    removeClientsFromConversation(groupId: string, clientIds: string[]): Promise<PostMlsMessageResponse>;
     private commitProposals;
     conversationExists(groupId: string): Promise<boolean>;
     clientValidKeypackagesCount(): Promise<number>;

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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"}

package/lib/messagingProtocols/mls/MLSService/MLSService.js

@@ -40,6 +40,7 @@ const bazinga64_1 = require("bazinga64");
 const logdown_1 = __importDefault(require("logdown"));
 const commons_1 = require("@wireapp/commons");
 const core_crypto_1 = require("@wireapp/core-crypto");
+const commitBundleUtil_1 = require("./commitBundleUtil");
 const pendingProposalsStore_1 = require("./stores/pendingProposalsStore");
 const subconversationGroupIdStore_1 = require("./stores/subconversationGroupIdStore/subconversationGroupIdStore");
 const messageSender_1 = require("../../../conversation/message/messageSender");
@@ -66,7 +67,6 @@ class MLSService extends TypedEventEmitter_1.TypedEventEmitter {
         this.logger = (0, logdown_1.default)('@wireapp/core/MLSService');
         this.textEncoder = new TextEncoder();
         this.textDecoder = new TextDecoder();
-        this.defaultCiphersuite = core_crypto_1.Ciphersuite.MLS_128_DHKEMX25519_AES128GCM_SHA256_Ed25519;
         this.config = {
             keyingMaterialUpdateThreshold,
             nbKeyPackages,
@@ -74,21 +74,22 @@ class MLSService extends TypedEventEmitter_1.TypedEventEmitter {
     }
     async initClient(userId, clientId) {
         const qualifiedClientId = (0, fullyQualifiedClientIdUtils_1.constructFullyQualifiedClientId)(userId.id, clientId, userId.domain);
-        await this.coreCryptoClient.mlsInit(this.textEncoder.encode(qualifiedClientId), [this.defaultCiphersuite]);
+        await this.coreCryptoClient.mlsInit(this.textEncoder.encode(qualifiedClientId), [
+            core_crypto_1.Ciphersuite.MLS_128_DHKEMX25519_AES128GCM_SHA256_Ed25519,
+        ]);
     }
     async createClient(userId, clientId) {
         await this.initClient(userId, clientId);
         // If the device is new, we need to upload keypackages and public key to the backend
-        const publicKey = await this.coreCryptoClient.clientPublicKey(this.defaultCiphersuite);
-        const keyPackages = await this.coreCryptoClient.clientKeypackages(this.defaultCiphersuite, this.config.nbKeyPackages);
+        const publicKey = await this.coreCryptoClient.clientPublicKey(core_crypto_1.Ciphersuite.MLS_128_DHKEMX25519_AES128GCM_SHA256_Ed25519);
+        const keyPackages = await this.coreCryptoClient.clientKeypackages(core_crypto_1.Ciphersuite.MLS_128_DHKEMX25519_AES128GCM_SHA256_Ed25519, this.config.nbKeyPackages);
         await this.uploadMLSPublicKeys(publicKey, clientId);
         await this.uploadMLSKeyPackages(keyPackages, clientId);
     }
     async uploadCommitBundle(groupId, commitBundle, { regenerateCommitBundle, isExternalCommit } = {}) {
-        const { commit, groupInfo, welcome } = commitBundle;
-        const bundlePayload = new Uint8Array([...commit, ...groupInfo.payload, ...(welcome || [])]);
+        const bundlePayload = (0, commitBundleUtil_1.toProtobufCommitBundle)(commitBundle);
         try {
-            const response = await this.apiClient.api.conversation.postMlsCommitBundle(bundlePayload);
+            const response = await this.apiClient.api.conversation.postMlsCommitBundle(bundlePayload.slice());
             if (isExternalCommit) {
                 await this.coreCryptoClient.mergePendingGroupFromExternalCommit(groupId);
             }
@@ -116,14 +117,19 @@ class MLSService extends TypedEventEmitter_1.TypedEventEmitter {
             else {
                 await this.coreCryptoClient.clearPendingCommit(groupId);
             }
+            throw error;
         }
-        return null;
     }
+    /**
+     * Will add users to an existing MLS group and send a commit bundle to backend.
+     * Cannot be called with an empty array of keys.
+     *
+     * @param groupId - the group id of the MLS group
+     * @param invitee - the list of keys of clients to add to the MLS group
+     */
     addUsersToExistingConversation(groupId, invitee) {
         if (invitee.length < 1) {
-            // providing an empty invitee list to addClientsToConversation method would make core-crypto throw an error
-            // we want to skip adding clinets in this case
-            return null;
+            throw new Error('Empty list of keys provided to addUsersToExistingConversation');
         }
         return this.processCommitAction(groupId, () => this.coreCryptoClient.addClientsToConversation(groupId, invitee));
     }
@@ -299,7 +305,7 @@ class MLSService extends TypedEventEmitter_1.TypedEventEmitter {
         const mlsKeyBytes = Object.values(mlsKeys).map((key) => bazinga64_1.Decoder.fromBase64(key).asBytes);
         const configuration = {
             externalSenders: mlsKeyBytes,
-            ciphersuite: this.defaultCiphersuite,
+            ciphersuite: core_crypto_1.Ciphersuite.MLS_128_DHKEMX25519_AES128GCM_SHA256_Ed25519,
         };
         await this.coreCryptoClient.createConversation(groupIdBytes, core_crypto_1.CredentialType.Basic, configuration);
         const keyPackages = await this.getKeyPackagesPayload(users.map(user => {
@@ -338,10 +344,10 @@ class MLSService extends TypedEventEmitter_1.TypedEventEmitter {
         return this.coreCryptoClient.conversationExists(groupIdBytes);
     }
     async clientValidKeypackagesCount() {
-        return this.coreCryptoClient.clientValidKeypackagesCount(this.defaultCiphersuite);
+        return this.coreCryptoClient.clientValidKeypackagesCount(core_crypto_1.Ciphersuite.MLS_128_DHKEMX25519_AES128GCM_SHA256_Ed25519);
     }
     async clientKeypackages(amountRequested) {
-        return this.coreCryptoClient.clientKeypackages(this.defaultCiphersuite, amountRequested);
+        return this.coreCryptoClient.clientKeypackages(core_crypto_1.Ciphersuite.MLS_128_DHKEMX25519_AES128GCM_SHA256_Ed25519, amountRequested);
     }
     /**
      * Renew key material for a given groupId

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

@@ -4,5 +4,5 @@ import { CommitBundle } from '@wireapp/core-crypto';
  * @param commitBundle a commit bundle generated by coreCrypto
  * @returns
  */
-export declare function toProtobufCommitBundle({ commit, welcome, groupInfo }: CommitBundle): Uint8Array;
+export declare function toProtobufCommitBundle({ commit, welcome, publicGroupState }: CommitBundle): Uint8Array;
 //# sourceMappingURL=commitBundleUtil.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"commitBundleUtil.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/mls/MLSService/commitBundleUtil.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAC,YAAY,EAA2C,MAAM,sBAAsB,CAAC;AAY5F;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,EAAC,MAAM,EAAE,OAAO,EAAE,SAAS,EAAC,EAAE,YAAY,GAAG,UAAU,CAW7F"}
+{"version":3,"file":"commitBundleUtil.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/mls/MLSService/commitBundleUtil.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAC,YAAY,EAAkD,MAAM,sBAAsB,CAAC;AAYnG;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,EAAC,MAAM,EAAE,OAAO,EAAE,gBAAgB,EAAC,EAAE,YAAY,GAAG,UAAU,CAWpG"}

package/lib/messagingProtocols/mls/MLSService/commitBundleUtil.js

@@ -27,20 +27,20 @@ const ratchetTreeMapping = {
     [core_crypto_1.RatchetTreeType.Delta]: mls_1.mls.RatchetTreeType.DELTA,
 };
 const groupInfoType = {
-    [core_crypto_1.GroupInfoEncryptionType.Plaintext]: mls_1.mls.GroupInfoType.PUBLIC_GROUP_STATE,
-    [core_crypto_1.GroupInfoEncryptionType.JweEncrypted]: mls_1.mls.GroupInfoType.GROUP_INFO_JWE,
+    [core_crypto_1.PublicGroupStateEncryptionType.Plaintext]: mls_1.mls.GroupInfoType.PUBLIC_GROUP_STATE,
+    [core_crypto_1.PublicGroupStateEncryptionType.JweEncrypted]: mls_1.mls.GroupInfoType.GROUP_INFO_JWE,
 };
 /**
  * Will convert a coreCrypto commit bundle into a Uint8Array representing a protobuf object
  * @param commitBundle a commit bundle generated by coreCrypto
  * @returns
  */
-function toProtobufCommitBundle({ commit, welcome, groupInfo }) {
-    const { ratchetTreeType, encryptionType } = groupInfo;
+function toProtobufCommitBundle({ commit, welcome, publicGroupState }) {
+    const { ratchetTreeType, encryptionType } = publicGroupState;
     return mls_1.mls.CommitBundle.encode({
         groupInfoBundle: {
             ratchetTreeType: ratchetTreeMapping[ratchetTreeType],
-            groupInfo: groupInfo.payload,
+            groupInfo: publicGroupState.payload,
             groupInfoType: groupInfoType[encryptionType],
         },
         commit,

package/lib/messagingProtocols/mls/MLSService/commitBundleUtil.test.js

@@ -27,17 +27,17 @@ describe('toProtobufCommitBundle', () => {
         const payload = {
             commit: Uint8Array.from([0]),
             welcome: Uint8Array.from([1]),
-            groupInfo: {
+            publicGroupState: {
                 ratchetTreeType: core_crypto_1.RatchetTreeType.Full,
                 payload: Uint8Array.from([2]),
-                encryptionType: core_crypto_1.GroupInfoEncryptionType.Plaintext,
+                encryptionType: core_crypto_1.PublicGroupStateEncryptionType.Plaintext,
             },
         };
         const result = (0, commitBundleUtil_1.toProtobufCommitBundle)(payload);
         const { commit, welcome, groupInfoBundle } = mls_1.mls.CommitBundle.decode(result);
         expect(bazinga64_1.Encoder.toBase64(commit)).toEqual(bazinga64_1.Encoder.toBase64(payload.commit));
         expect(bazinga64_1.Encoder.toBase64(welcome)).toEqual(bazinga64_1.Encoder.toBase64(payload.welcome));
-        expect(bazinga64_1.Encoder.toBase64(groupInfoBundle.groupInfo)).toEqual(bazinga64_1.Encoder.toBase64(payload.groupInfo.payload));
+        expect(bazinga64_1.Encoder.toBase64(groupInfoBundle.groupInfo)).toEqual(bazinga64_1.Encoder.toBase64(payload.publicGroupState.payload));
         expect(groupInfoBundle.ratchetTreeType).toEqual(mls_1.mls.RatchetTreeType.FULL);
         expect(groupInfoBundle.groupInfoType).toEqual(mls_1.mls.GroupInfoType.PUBLIC_GROUP_STATE);
     });

package/package.json

@@ -11,9 +11,9 @@
     "./lib/cryptography/AssetCryptography/crypto.node": "./lib/cryptography/AssetCryptography/crypto.browser.js"
   },
   "dependencies": {
-    "@wireapp/api-client": "^24.15.6-draft-20-cc.0",
+    "@wireapp/api-client": "^24.15.6",
     "@wireapp/commons": "^5.1.0",
-    "@wireapp/core-crypto": "1.0.0-pre.5",
+    "@wireapp/core-crypto": "0.11.0",
     "@wireapp/cryptobox": "12.8.0",
     "@wireapp/promise-queue": "^2.2.0",
     "@wireapp/protocol-messaging": "1.44.0",
@@ -37,7 +37,7 @@
     "@types/long": "^5.0.0",
     "@types/rimraf": "^3.0.2",
     "@types/tough-cookie": "4.0.2",
-    "commander": "10.0.1",
+    "commander": "11.0.0",
     "cross-env": "7.0.3",
     "dotenv-defaults": "5.0.2",
     "fake-indexeddb": "^4.0.0",
@@ -60,6 +60,6 @@
     "test:coverage": "jest --coverage",
     "watch": "tsc --watch"
   },
-  "version": "40.5.3-draft-20-cc.0",
-  "gitHead": "65797abcfc2b0c8e61c5375f7de53b983347a4b9"
+  "version": "40.5.3",
+  "gitHead": "20950a4f74a00ab33d6e46cc34ee425def930462"
 }