@wireapp/core 40.5.3-draft-20-cc.3 → 40.5.3-draft-20-cc-1.3

package/lib/Account.d.ts

@@ -95,15 +95,16 @@ export declare class Account extends TypedEventEmitter<Events> {
     /**
      * Will set the APIClient to use a specific version of the API (by default uses version 0)
      * It will fetch the API Config and use the highest possible version
-     * @param acceptedVersions Which version the consumer supports
-     * @param useDevVersion allow the api-client to use development version of the api (if present). The dev version also need to be listed on the supportedVersions given as parameters
+     * @param min mininum version to use
+     * @param max maximum version to use
+     * @param allowDev allow the api-client to use development version of the api (if present). The dev version also need to be listed on the supportedVersions given as parameters
      *   If we have version 2 that is a dev version, this is going to be the output of those calls
-     *   - useVersion([0, 1, 2], true) > version 2 is used
-     *   - useVersion([0, 1, 2], false) > version 1 is used
-     *   - useVersion([0, 1], true) > version 1 is used
+     *   - useVersion(0, 2, true) > version 2 is used
+     *   - useVersion(0, 2) > version 1 is used
+     *   - useVersion(0, 1, true) > version 1 is used
      * @return The highest version that is both supported by client and backend
      */
-    useAPIVersion(supportedVersions: number[], useDevVersion?: boolean): Promise<BackendFeatures>;
+    useAPIVersion(min: number, max: number, allowDev?: boolean): Promise<BackendFeatures>;
     private persistCookie;
     get clientId(): string;
     get userId(): string;
@@ -136,7 +137,8 @@ export declare class Account extends TypedEventEmitter<Events> {
      *
      * @returns The local existing client or undefined if the client does not exist or is not valid (non existing on backend)
      */
-    initClient(client?: RegisteredClient): Promise<RegisteredClient | undefined>;
+    initClient(client: RegisteredClient): Promise<RegisteredClient>;
+    initClient(): Promise<RegisteredClient | undefined>;
     private buildCryptoClient;
     /**
      * In order to be able to send MLS messages, the core needs a few information from the consumer.

package/lib/Account.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Account.d.ts","sourceRoot":"","sources":["../src/Account.ts"],"names":[],"mappings":"AAmBA,OAAO,EACL,YAAY,EAGZ,OAAO,EACP,MAAM,EAEN,SAAS,EACV,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAuB,UAAU,EAAE,gBAAgB,EAAC,MAAM,iCAAiC,CAAC;AACnG,OAAO,KAAK,MAAM,MAAM,+BAA+B,CAAC;AAOxD,OAAO,EAAC,SAAS,EAAE,eAAe,EAAC,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAC,UAAU,EAAe,MAAM,uBAAuB,CAAC;AAE/D,OAAO,EAAC,cAAc,EAAC,MAAM,YAAY,CAAC;AAE1C,OAAO,EAAC,gBAAgB,EAAC,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAC,UAAU,EAAE,aAAa,EAAC,MAAM,WAAW,CAAC;AACpD,OAAO,EAAC,iBAAiB,EAAC,MAAM,eAAe,CAAC;AAChD,OAAO,EAAC,YAAY,EAAE,mBAAmB,EAAC,MAAM,iBAAiB,CAAC;AAElE,OAAO,EAAC,YAAY,EAAC,MAAM,UAAU,CAAC;AACtC,OAAO,EAAC,kBAAkB,EAAC,MAAM,eAAe,CAAC;AACjD,OAAO,EAAC,UAAU,EAAC,MAAM,0BAA0B,CAAC;AACpD,OAAO,EAAC,YAAY,EAAE,oBAAoB,EAAC,MAAM,gCAAgC,CAAC;AAClF,OAAO,EAAC,SAAS,EAAE,cAAc,EAAC,MAAM,8BAA8B,CAAC;AAEvE,OAAO,EAAC,mBAAmB,EAAE,mBAAmB,EAAE,kBAAkB,EAAC,MAAM,iBAAiB,CAAC;AAC7F,OAAO,EAAC,WAAW,EAAC,MAAM,SAAS,CAAC;AAEpC,OAAO,EAAC,WAAW,EAAC,MAAM,SAAS,CAAC;AACpC,OAAO,EAAC,WAAW,EAAC,MAAM,SAAS,CAAC;AACpC,OAAO,EAAC,iBAAiB,EAAC,MAAM,0BAA0B,CAAC;AAE3D,MAAM,MAAM,qBAAqB,GAAG,mBAAmB,CAAC;AAExD,oBAAY,MAAM;IAChB;;;OAGG;IACH,WAAW,gBAAgB;CAC5B;AAED,oBAAY,eAAe;IACzB,8EAA8E;IAC9E,MAAM,WAAW;IACjB,oCAAoC;IACpC,UAAU,eAAe;IACzB,mFAAmF;IACnF,wBAAwB,6BAA6B;IACrD,oGAAoG;IACpG,IAAI,SAAS;CACd;AAED,MAAM,MAAM,aAAa,GAAG,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,KAAK,SAAS,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAAC;AAEjH,UAAU,cAAc;IACtB,8FAA8F;IAC9F,WAAW,CAAC,EAAE,aAAa,CAAC;IAE5B;;;;;;;;OAQG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,oBAAoB,CAAC,EAAE,oBAAoB,CAAC;CAC7C;AAED,KAAK,WAAW,GAAG;IACjB,2FAA2F;IAC3F,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAQF,KAAK,MAAM,GAAG;IACZ,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,SAAS,CAAC;CACjC,CAAC;AAEF,qBAAa,OAAQ,SAAQ,iBAAiB,CAAC,MAAM,CAAC;IACpD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAY;IACtC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAiB;IACxC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAgB;IAC5C,OAAO,CAAC,WAAW,CAAC,CAAa;IACjC,OAAO,CAAC,EAAE,CAAC,CAAe;IAC1B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CAAuB;IAEtD,OAAO,CAAC,EAAE;QACf,GAAG,CAAC,EAAE,UAAU,CAAC;QACjB,OAAO,EAAE,cAAc,CAAC;QACxB,OAAO,EAAE,cAAc,CAAC;QACxB,KAAK,EAAE,YAAY,CAAC;QACpB,SAAS,EAAE,gBAAgB,CAAC;QAC5B,MAAM,EAAE,aAAa,CAAC;QACtB,UAAU,EAAE,iBAAiB,CAAC;QAC9B,YAAY,EAAE,mBAAmB,CAAC;QAClC,KAAK,EAAE,YAAY,CAAC;QACpB,WAAW,EAAE,kBAAkB,CAAC;QAChC,YAAY,EAAE,mBAAmB,CAAC;QAClC,IAAI,EAAE,WAAW,CAAC;QAClB,IAAI,EAAE,WAAW,CAAC;QAClB,IAAI,EAAE,WAAW,CAAC;KACnB,CAAC;IACK,eAAe,EAAE,eAAe,CAAC;IAExC;;;OAGG;gBAED,SAAS,GAAE,SAA2B,EACtC,EAAC,WAA6B,EAAE,SAAa,EAAE,oBAAoB,EAAC,GAAE,cAAmB;IAyB3F;;;;;;;;;;OAUG;IACU,aAAa,CAAC,iBAAiB,EAAE,MAAM,EAAE,EAAE,aAAa,CAAC,EAAE,OAAO;IAM/E,OAAO,CAAC,aAAa;IAKrB,IAAI,QAAQ,IAAI,MAAM,CAErB;IAED,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED;;;;;OAKG;IACU,QAAQ,CAAC,YAAY,EAAE,YAAY,EAAE,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC;IAM3F;;;;OAIG;IACU,IAAI,CAAC,UAAU,EAAE,UAAU,EAAE,EAAC,MAAM,EAAC,GAAE,WAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;IAMvF;;;;;OAKG;IACU,KAAK,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC;IAU1D;;OAEG;IACU,cAAc,CACzB,SAAS,EAAE,SAAS,EACpB,UAAU,GAAE,UAA8B,EAC1C,WAAW,CAAC,EAAE,UAAU,GACvB,OAAO,CAAC,gBAAgB,CAAC;IAsB5B;;;;OAIG;IACU,UAAU,CAAC,MAAM,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;YAiC3E,iBAAiB;IAoB/B;;;;;;OAMG;IACH,qBAAqB,CAAC,YAAY,EAAE,YAAY;IAInC,YAAY,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAwD1D,OAAO,CAAC,YAAY;IAKpB;;;OAGG;IACU,MAAM,CAAC,SAAS,GAAE,OAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAS9D;;OAEG;YACW,IAAI;IAOlB;;;;;;OAMG;IACI,MAAM,CAAC,EACZ,OAAkB,EAClB,wBAAmC,EACnC,4BAAuC,EACvC,qBAAgC,EAChC,MAAc,GACf,GAAE;QACD;;;;WAIG;QACH,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,mBAAmB,EAAE,MAAM,EAAE,kBAAkB,KAAK,IAAI,CAAC;QAE7E;;WAEG;QACH,4BAA4B,CAAC,EAAE,CAAC,EAAC,IAAI,EAAE,KAAK,EAAC,EAAE;YAAC,IAAI,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,MAAM,CAAA;SAAC,KAAK,IAAI,CAAC;QAEtF;;WAEG;QACH,wBAAwB,CAAC,EAAE,CAAC,KAAK,EAAE,eAAe,KAAK,IAAI,CAAC;QAE5D;;;;;;WAMG;QACH,qBAAqB,CAAC,EAAE,CAAC,cAAc,EAAE,MAAM,KAAK,IAAI,CAAC;QAEzD;;WAEG;QACH,MAAM,CAAC,EAAE,OAAO,CAAC;KACb,GAAG,MAAM,IAAI;IA2FnB,OAAO,CAAC,cAAc;IAKtB,OAAO,CAAC,kBAAkB;YAIZ,UAAU;CAqBzB"}
+{"version":3,"file":"Account.d.ts","sourceRoot":"","sources":["../src/Account.ts"],"names":[],"mappings":"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"}

package/lib/Account.js

@@ -49,6 +49,7 @@ const linkPreview_1 = require("./linkPreview");
 const mls_1 = require("./messagingProtocols/mls");
 const proteus_1 = require("./messagingProtocols/proteus");
 const CryptoClient_1 = require("./messagingProtocols/proteus/ProteusService/CryptoClient");
+const cryptoMigrationStateStore_1 = require("./messagingProtocols/proteus/ProteusService/cryptoMigrationStateStore");
 const notification_1 = require("./notification/");
 const self_1 = require("./self/");
 const CoreDB_1 = require("./storage/CoreDB");
@@ -62,7 +63,7 @@ var EVENTS;
      * An unknown client is a client we don't yet have a session with
      */
     EVENTS["NEW_SESSION"] = "new_session";
-})(EVENTS = exports.EVENTS || (exports.EVENTS = {}));
+})(EVENTS || (exports.EVENTS = EVENTS = {}));
 var ConnectionState;
 (function (ConnectionState) {
     /** The websocket is closed and notifications stream is not being processed */
@@ -73,7 +74,7 @@ var ConnectionState;
     ConnectionState["PROCESSING_NOTIFICATIONS"] = "processing_notifications";
     /** The websocket is open and message will go through and notifications stream is fully processed */
     ConnectionState["LIVE"] = "live";
-})(ConnectionState = exports.ConnectionState || (exports.ConnectionState = {}));
+})(ConnectionState || (exports.ConnectionState = ConnectionState = {}));
 const coreDefaultClient = {
     classification: client_1.ClientClassification.DESKTOP,
     cookieLabel: 'default',
@@ -109,16 +110,17 @@ class Account extends TypedEventEmitter_1.TypedEventEmitter {
     /**
      * Will set the APIClient to use a specific version of the API (by default uses version 0)
      * It will fetch the API Config and use the highest possible version
-     * @param acceptedVersions Which version the consumer supports
-     * @param useDevVersion allow the api-client to use development version of the api (if present). The dev version also need to be listed on the supportedVersions given as parameters
+     * @param min mininum version to use
+     * @param max maximum version to use
+     * @param allowDev allow the api-client to use development version of the api (if present). The dev version also need to be listed on the supportedVersions given as parameters
      *   If we have version 2 that is a dev version, this is going to be the output of those calls
-     *   - useVersion([0, 1, 2], true) > version 2 is used
-     *   - useVersion([0, 1, 2], false) > version 1 is used
-     *   - useVersion([0, 1], true) > version 1 is used
+     *   - useVersion(0, 2, true) > version 2 is used
+     *   - useVersion(0, 2) > version 1 is used
+     *   - useVersion(0, 1, true) > version 1 is used
      * @return The highest version that is both supported by client and backend
      */
-    async useAPIVersion(supportedVersions, useDevVersion) {
-        const features = await this.apiClient.useVersion(supportedVersions, useDevVersion);
+    async useAPIVersion(min, max, allowDev) {
+        const features = await this.apiClient.useVersion(min, max, allowDev);
         this.backendFeatures = features;
         return features;
     }
@@ -173,8 +175,9 @@ class Account extends TypedEventEmitter_1.TypedEventEmitter {
         if (!this.service || !this.apiClient.context || !this.storeEngine) {
             throw new Error('Services are not set or context not initialized.');
         }
+        // we reset the services to re-instantiate a new CryptoClient instance
+        await this.initServices(this.apiClient.context);
         const initialPreKeys = await this.service.proteus.createClient(entropyData);
-        await this.service.proteus.initClient(this.storeEngine, this.apiClient.context);
         const client = await this.service.client.register(loginData, clientInfo, initialPreKeys);
         if (this.service.mls) {
             const { userId, domain = '' } = this.apiClient.context;
@@ -182,15 +185,9 @@ class Account extends TypedEventEmitter_1.TypedEventEmitter {
         }
         this.logger.info(`Created new client {mls: ${!!this.service.mls}, id: ${client.id}}`);
         await this.service.notification.initializeNotificationStream();
-        await this.service.client.synchronizeClients();
-        await this.initClient(client);
-        return client;
+        await this.service.client.synchronizeClients(client.id);
+        return this.initClient(client);
     }
-    /**
-     * Will initiate all the cryptographic material of the device and setup all the background tasks.
-     *
-     * @returns The local existing client or undefined if the client does not exist or is not valid (non existing on backend)
-     */
     async initClient(client) {
         if (!this.service || !this.apiClient.context || !this.storeEngine) {
             throw new Error('Services are not set.');
@@ -211,19 +208,26 @@ class Account extends TypedEventEmitter_1.TypedEventEmitter {
             }
             // initialize schedulers for pending mls proposals once client is initialized
             await this.service.mls.checkExistingPendingProposals();
-            // initialize schedulers for renewing key materials
-            this.service.mls.checkForKeyMaterialsUpdate();
             // initialize scheduler for syncing key packages with backend
             this.service.mls.checkForKeyPackagesBackendSync();
+            // leave stale conference subconversations (e.g after a crash)
+            await this.service.mls.leaveStaleConferenceSubconversations();
         }
         return validClient;
     }
-    async buildCryptoClient(context, storeEngine, db, enableMLS) {
+    async buildCryptoClient(context, storeEngine, enableMLS) {
         var _a, _b, _c;
-        const clientType = enableMLS || !!((_a = this.cryptoProtocolConfig) === null || _a === void 0 ? void 0 : _a.useCoreCrypto)
+        /* There are 3 cases where we want to instantiate CoreCrypto:
+         * 1. MLS is enabled
+         * 2. The user has enabled CoreCrypto in the config
+         * 3. The user has already used CoreCrypto in the past (cannot rollback to using cryptobox)
+         */
+        const clientType = enableMLS ||
+            !!((_a = this.cryptoProtocolConfig) === null || _a === void 0 ? void 0 : _a.useCoreCrypto) ||
+            cryptoMigrationStateStore_1.cryptoMigrationStore.coreCrypto.isReady(storeEngine.storeName)
             ? CryptoClient_1.CryptoClientType.CORE_CRYPTO
             : CryptoClient_1.CryptoClientType.CRYPTOBOX;
-        return (0, CryptoClient_1.buildCryptoClient)(clientType, db, {
+        return (0, CryptoClient_1.buildCryptoClient)(clientType, {
             storeEngine,
             nbPrekeys: this.nbPrekeys,
             coreCryptoWasmFilePath: (_b = this.cryptoProtocolConfig) === null || _b === void 0 ? void 0 : _b.coreCrypoWasmFilePath,
@@ -253,14 +257,12 @@ class Account extends TypedEventEmitter_1.TypedEventEmitter {
         this.db = await (0, CoreDB_1.openDB)(this.generateCoreDbName(context));
         const accountService = new account_1.AccountService(this.apiClient);
         const assetService = new conversation_1.AssetService(this.apiClient);
-        const cryptoClientDef = await this.buildCryptoClient(context, this.storeEngine, this.db, enableMLS);
+        const cryptoClientDef = await this.buildCryptoClient(context, this.storeEngine, enableMLS);
         const [clientType, cryptoClient] = cryptoClientDef;
         const mlsService = clientType === CryptoClient_1.CryptoClientType.CORE_CRYPTO && enableMLS
             ? new mls_1.MLSService(this.apiClient, cryptoClient.getNativeClient(), Object.assign(Object.assign({}, (_b = this.cryptoProtocolConfig) === null || _b === void 0 ? void 0 : _b.mls), { nbKeyPackages: this.nbPrekeys }))
             : undefined;
         const proteusService = new proteus_1.ProteusService(this.apiClient, cryptoClient, {
-            // We can use qualified ids to send messages as long as the backend supports federated endpoints
-            useQualifiedIds: this.backendFeatures.federationEndpoints,
             onNewClient: payload => this.emit(EVENTS.NEW_SESSION, payload),
             nbPrekeys: this.nbPrekeys,
         });
@@ -273,7 +275,7 @@ class Account extends TypedEventEmitter_1.TypedEventEmitter {
         const selfService = new self_1.SelfService(this.apiClient);
         const teamService = new team_1.TeamService(this.apiClient);
         const broadcastService = new broadcast_1.BroadcastService(this.apiClient, proteusService);
-        const userService = new user_1.UserService(this.apiClient, broadcastService, connectionService);
+        const userService = new user_1.UserService(this.apiClient);
         this.service = {
             mls: mlsService,
             proteus: proteusService,
@@ -346,16 +348,11 @@ class Account extends TypedEventEmitter_1.TypedEventEmitter {
             try {
                 const messages = this.service.notification.handleNotification(notification, source, dryRun);
                 try {
-                    for (var _d = true, messages_1 = __asyncValues(messages), messages_1_1; messages_1_1 = await messages_1.next(), _a = messages_1_1.done, !_a;) {
+                    for (var _d = true, messages_1 = __asyncValues(messages), messages_1_1; messages_1_1 = await messages_1.next(), _a = messages_1_1.done, !_a; _d = true) {
                         _c = messages_1_1.value;
                         _d = false;
-                        try {
-                            const message = _c;
-                            await handleEvent(message, source);
-                        }
-                        finally {
-                            _d = true;
-                        }
+                        const message = _c;
+                        await handleEvent(message, source);
                     }
                 }
                 catch (e_1_1) { e_1 = { error: e_1_1 }; }

package/lib/CoreError.js

@@ -22,4 +22,4 @@ exports.CoreError = void 0;
 var CoreError;
 (function (CoreError) {
     CoreError["NOTIFICATION_ERROR"] = "CoreError.NOTIFICATION_ERROR";
-})(CoreError = exports.CoreError || (exports.CoreError = {}));
+})(CoreError || (exports.CoreError = CoreError = {}));

package/lib/broadcast/BroadcastService.d.ts

@@ -1,5 +1,4 @@
-import { ClientMismatch, MessageSendingStatus, QualifiedUserClients, UserClients } from '@wireapp/api-client/lib/conversation';
-import { UserPreKeyBundleMap } from '@wireapp/api-client/lib/user/';
+import { MessageSendingStatus, QualifiedUserClients } from '@wireapp/api-client/lib/conversation';
 import { APIClient } from '@wireapp/api-client';
 import { GenericMessage } from '@wireapp/protocol-messaging';
 import { ProteusService } from '../messagingProtocols/proteus';
@@ -8,14 +7,6 @@ export declare class BroadcastService {
     private readonly proteusService;
     private readonly messageService;
     constructor(apiClient: APIClient, proteusService: ProteusService);
-    /**
-     * Will create a key bundle for all the users of the team
-     *
-     * @param teamId
-     * @param skipOwnClients=false
-     * @param onlyDirectConnections=false Will generate a bundle only for directly connected users (users the self user has conversation with). Allows avoiding broadcasting messages to too many people
-     */
-    getPreKeyBundlesFromTeam(teamId: string, skipOwnClients?: boolean, onlyDirectConnections?: boolean): Promise<UserPreKeyBundleMap>;
-    broadcastGenericMessage(genericMessage: GenericMessage, recipients: UserPreKeyBundleMap | UserClients | QualifiedUserClients, sendAsProtobuf?: boolean, onClientMismatch?: (mismatch: ClientMismatch | MessageSendingStatus) => void | boolean | Promise<boolean>): Promise<ClientMismatch | MessageSendingStatus>;
+    broadcastGenericMessage(genericMessage: GenericMessage, recipients: QualifiedUserClients, onClientMismatch?: (mismatch: MessageSendingStatus) => void | boolean | Promise<boolean>): Promise<MessageSendingStatus>;
 }
 //# sourceMappingURL=BroadcastService.d.ts.map

package/lib/broadcast/BroadcastService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BroadcastService.d.ts","sourceRoot":"","sources":["../../src/broadcast/BroadcastService.ts"],"names":[],"mappings":"AAmBA,OAAO,EACL,cAAc,EACd,oBAAoB,EACpB,oBAAoB,EACpB,WAAW,EACZ,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAC,mBAAmB,EAAC,MAAM,+BAA+B,CAAC;AAElE,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAC,cAAc,EAAC,MAAM,6BAA6B,CAAC;AAK3D,OAAO,EAAC,cAAc,EAAC,MAAM,+BAA+B,CAAC;AAG7D,qBAAa,gBAAgB;IAGf,OAAO,CAAC,QAAQ,CAAC,SAAS;IAAa,OAAO,CAAC,QAAQ,CAAC,cAAc;IAFlF,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;gBAEnB,SAAS,EAAE,SAAS,EAAmB,cAAc,EAAE,cAAc;IAIlG;;;;;;OAMG;IACU,wBAAwB,CACnC,MAAM,EAAE,MAAM,EACd,cAAc,UAAQ,EACtB,qBAAqB,UAAQ,GAC5B,OAAO,CAAC,mBAAmB,CAAC;IAyBlB,uBAAuB,CAClC,cAAc,EAAE,cAAc,EAC9B,UAAU,EAAE,mBAAmB,GAAG,WAAW,GAAG,oBAAoB,EACpE,cAAc,CAAC,EAAE,OAAO,EACxB,gBAAgB,CAAC,EAAE,CAAC,QAAQ,EAAE,cAAc,GAAG,oBAAoB,KAAK,IAAI,GAAG,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;CAkB5G"}
+{"version":3,"file":"BroadcastService.d.ts","sourceRoot":"","sources":["../../src/broadcast/BroadcastService.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,oBAAoB,EAAE,oBAAoB,EAAC,MAAM,sCAAsC,CAAC;AAEhG,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAC,cAAc,EAAC,MAAM,6BAA6B,CAAC;AAK3D,OAAO,EAAC,cAAc,EAAC,MAAM,+BAA+B,CAAC;AAE7D,qBAAa,gBAAgB;IAGf,OAAO,CAAC,QAAQ,CAAC,SAAS;IAAa,OAAO,CAAC,QAAQ,CAAC,cAAc;IAFlF,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;gBAEnB,SAAS,EAAE,SAAS,EAAmB,cAAc,EAAE,cAAc;IAIrF,uBAAuB,CAClC,cAAc,EAAE,cAAc,EAC9B,UAAU,EAAE,oBAAoB,EAChC,gBAAgB,CAAC,EAAE,CAAC,QAAQ,EAAE,oBAAoB,KAAK,IAAI,GAAG,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;CAY3F"}

package/lib/broadcast/BroadcastService.js

@@ -23,53 +23,19 @@ const protocol_messaging_1 = require("@wireapp/protocol-messaging");
 const messageSender_1 = require("../conversation/message/messageSender");
 const MessageService_1 = require("../conversation/message/MessageService");
 const UserClientsUtil_1 = require("../conversation/message/UserClientsUtil");
-const util_1 = require("../util");
 class BroadcastService {
     constructor(apiClient, proteusService) {
         this.apiClient = apiClient;
         this.proteusService = proteusService;
         this.messageService = new MessageService_1.MessageService(this.apiClient, this.proteusService);
     }
-    /**
-     * Will create a key bundle for all the users of the team
-     *
-     * @param teamId
-     * @param skipOwnClients=false
-     * @param onlyDirectConnections=false Will generate a bundle only for directly connected users (users the self user has conversation with). Allows avoiding broadcasting messages to too many people
-     */
-    async getPreKeyBundlesFromTeam(teamId, skipOwnClients = false, onlyDirectConnections = false) {
-        const teamMembers = onlyDirectConnections
-            ? (await this.apiClient.api.conversation.getConversations()).conversations
-                .map(({ members }) => members.others.map(user => user.id).concat(members.self.id))
-                .flat()
-            : (await this.apiClient.api.teams.member.getAllMembers(teamId)).members.map(({ user }) => user);
-        let members = Array.from(new Set(teamMembers)).map(member => ({ id: member }));
-        if (skipOwnClients) {
-            const selfUser = await this.apiClient.api.self.getSelf();
-            members = members.filter(member => member.id !== selfUser.id);
-        }
-        const preKeys = await Promise.all(members.map(member => this.apiClient.api.user.getUserPreKeys(member.id)));
-        return preKeys.reduce((bundleMap, bundle) => {
-            bundleMap[bundle.user] = {};
-            for (const client of bundle.clients) {
-                bundleMap[bundle.user][client.client] = client.prekey;
-            }
-            return bundleMap;
-        }, {});
-    }
-    async broadcastGenericMessage(genericMessage, recipients, sendAsProtobuf, onClientMismatch) {
+    async broadcastGenericMessage(genericMessage, recipients, onClientMismatch) {
         const plainTextArray = protocol_messaging_1.GenericMessage.encode(genericMessage).finish();
         const send = () => {
-            return (0, util_1.isQualifiedUserClients)(recipients)
-                ? this.messageService.sendFederatedMessage(this.apiClient.validatedClientId, recipients, plainTextArray, {
-                    reportMissing: (0, UserClientsUtil_1.flattenQualifiedUserClients)(recipients).map(({ userId }) => userId),
-                    onClientMismatch,
-                })
-                : this.messageService.sendMessage(this.apiClient.validatedClientId, recipients, plainTextArray, {
-                    sendAsProtobuf,
-                    reportMissing: Object.keys(recipients),
-                    onClientMismatch,
-                });
+            return this.messageService.sendMessage(this.apiClient.validatedClientId, recipients, plainTextArray, {
+                reportMissing: (0, UserClientsUtil_1.flattenUserMap)(recipients).map(({ userId }) => userId),
+                onClientMismatch,
+            });
         };
         return (0, messageSender_1.sendMessage)(send);
     }

package/lib/client/ClientDatabaseRepository.d.ts

@@ -1,4 +1,5 @@
 import { RegisteredClient } from '@wireapp/api-client/lib/client/';
+import { QualifiedId } from '@wireapp/api-client/lib/user';
 import { CRUDEngine } from '@wireapp/store-engine';
 import { MetaClient } from './ClientService';
 export declare enum DatabaseStores {
@@ -6,21 +7,20 @@ export declare enum DatabaseStores {
 }
 export declare class ClientDatabaseRepository {
     private readonly storeEngine;
-    private readonly useQualifiedIds;
     static readonly STORES: typeof DatabaseStores;
     static KEYS: {
         LOCAL_IDENTITY: string;
     };
-    constructor(storeEngine: CRUDEngine, useQualifiedIds: boolean);
+    constructor(storeEngine: CRUDEngine);
     getLocalClient(): Promise<MetaClient>;
     getClient(sessionId: string): Promise<MetaClient>;
     deleteLocalClient(): Promise<string>;
     deleteClient(sessionId: string): Promise<string>;
-    createClientList(userId: string, clientList: RegisteredClient[], domain?: string): Promise<MetaClient[]>;
+    createClientList(userId: QualifiedId, clientList: RegisteredClient[]): Promise<MetaClient[]>;
     createLocalClient(client: RegisteredClient, domain?: string): Promise<MetaClient>;
     updateLocalClient(client: RegisteredClient, domain?: string): Promise<MetaClient>;
-    updateClient(userId: string, client: RegisteredClient, domain?: string): Promise<MetaClient>;
-    createClient(userId: string, client: RegisteredClient, domain?: string): Promise<MetaClient>;
+    updateClient(userId: QualifiedId, client: RegisteredClient): Promise<MetaClient>;
+    createClient(userId: QualifiedId, client: RegisteredClient): Promise<MetaClient>;
     private transformClient;
     private transformLocalClient;
 }

package/lib/client/ClientDatabaseRepository.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ClientDatabaseRepository.d.ts","sourceRoot":"","sources":["../../src/client/ClientDatabaseRepository.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,gBAAgB,EAAC,MAAM,iCAAiC,CAAC;AAEjE,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAC;AAEjD,OAAO,EAAC,UAAU,EAAC,MAAM,iBAAiB,CAAC;AAI3C,oBAAY,cAAc;IACxB,OAAO,YAAY;CACpB;AAED,qBAAa,wBAAwB;IAOvB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAAc,OAAO,CAAC,QAAQ,CAAC,eAAe;IANtF,gBAAuB,MAAM,wBAAkB;IAE/C,OAAc,IAAI;;MAEhB;gBAE2B,WAAW,EAAE,UAAU,EAAmB,eAAe,EAAE,OAAO;IAExF,cAAc,IAAI,OAAO,CAAC,UAAU,CAAC;IAIrC,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IAIjD,iBAAiB,IAAI,OAAO,CAAC,MAAM,CAAC;IAIpC,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAIhD,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,gBAAgB,EAAE,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;IAQlG,iBAAiB,CAAC,MAAM,EAAE,gBAAgB,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IAUjF,iBAAiB,CAAC,MAAM,EAAE,gBAAgB,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IAUjF,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IAe5F,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IAezG,OAAO,CAAC,eAAe;IAgBvB,OAAO,CAAC,oBAAoB;CAO7B"}
+{"version":3,"file":"ClientDatabaseRepository.d.ts","sourceRoot":"","sources":["../../src/client/ClientDatabaseRepository.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,gBAAgB,EAAC,MAAM,iCAAiC,CAAC;AACjE,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AAEzD,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAC;AAEjD,OAAO,EAAC,UAAU,EAAC,MAAM,iBAAiB,CAAC;AAI3C,oBAAY,cAAc;IACxB,OAAO,YAAY;CACpB;AAED,qBAAa,wBAAwB;IAOvB,OAAO,CAAC,QAAQ,CAAC,WAAW;IANxC,gBAAuB,MAAM,wBAAkB;IAE/C,OAAc,IAAI;;MAEhB;gBAE2B,WAAW,EAAE,UAAU;IAE7C,cAAc,IAAI,OAAO,CAAC,UAAU,CAAC;IAIrC,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IAIjD,iBAAiB,IAAI,OAAO,CAAC,MAAM,CAAC;IAIpC,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAIhD,gBAAgB,CAAC,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;IAQtF,iBAAiB,CAAC,MAAM,EAAE,gBAAgB,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IAUjF,iBAAiB,CAAC,MAAM,EAAE,gBAAgB,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IAUjF,YAAY,CAAC,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,UAAU,CAAC;IAahF,YAAY,CAAC,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,UAAU,CAAC;IAa7F,OAAO,CAAC,eAAe;IAcvB,OAAO,CAAC,oBAAoB;CAO7B"}

package/lib/client/ClientDatabaseRepository.js

@@ -23,11 +23,10 @@ const SessionHandler_1 = require("../messagingProtocols/proteus/Utility/SessionH
 var DatabaseStores;
 (function (DatabaseStores) {
     DatabaseStores["CLIENTS"] = "clients";
-})(DatabaseStores = exports.DatabaseStores || (exports.DatabaseStores = {}));
+})(DatabaseStores || (exports.DatabaseStores = DatabaseStores = {}));
 class ClientDatabaseRepository {
-    constructor(storeEngine, useQualifiedIds) {
+    constructor(storeEngine) {
         this.storeEngine = storeEngine;
-        this.useQualifiedIds = useQualifiedIds;
     }
     getLocalClient() {
         return this.getClient(ClientDatabaseRepository.KEYS.LOCAL_IDENTITY);
@@ -41,10 +40,10 @@ class ClientDatabaseRepository {
     deleteClient(sessionId) {
         return this.storeEngine.delete(ClientDatabaseRepository.STORES.CLIENTS, sessionId);
     }
-    createClientList(userId, clientList, domain) {
+    createClientList(userId, clientList) {
         const createClientTasks = [];
         for (const client of clientList) {
-            createClientTasks.push(this.createClient(userId, client, domain));
+            createClientTasks.push(this.createClient(userId, client));
         }
         return Promise.all(createClientTasks);
     }
@@ -58,34 +57,28 @@ class ClientDatabaseRepository {
         await this.storeEngine.update(ClientDatabaseRepository.STORES.CLIENTS, ClientDatabaseRepository.KEYS.LOCAL_IDENTITY, transformedClient);
         return transformedClient;
     }
-    async updateClient(userId, client, domain) {
-        const transformedClient = this.transformClient(userId, client, false, domain);
+    async updateClient(userId, client) {
+        const transformedClient = this.transformClient(userId, client, false);
         await this.storeEngine.update(ClientDatabaseRepository.STORES.CLIENTS, (0, SessionHandler_1.constructSessionId)({
             userId,
             clientId: client.id,
-            domain,
-            useQualifiedIds: this.useQualifiedIds,
         }), transformedClient);
         return transformedClient;
     }
-    async createClient(userId, client, domain) {
-        const transformedClient = this.transformClient(userId, client, false, domain);
+    async createClient(userId, client) {
+        const transformedClient = this.transformClient(userId, client, false);
         await this.storeEngine.create(ClientDatabaseRepository.STORES.CLIENTS, (0, SessionHandler_1.constructSessionId)({
             userId,
             clientId: client.id,
-            domain,
-            useQualifiedIds: this.useQualifiedIds,
         }), transformedClient);
         return transformedClient;
     }
-    transformClient(userId, client, verified, domain) {
-        return Object.assign(Object.assign({}, client), { domain, meta: {
+    transformClient(userId, client, verified) {
+        return Object.assign(Object.assign({}, client), { domain: userId.domain, meta: {
                 is_verified: verified,
                 primary_key: (0, SessionHandler_1.constructSessionId)({
                     userId,
                     clientId: client.id,
-                    domain,
-                    useQualifiedIds: this.useQualifiedIds,
                 }),
             } });
     }

package/lib/client/ClientService.d.ts

@@ -45,7 +45,11 @@ export declare class ClientService {
      */
     loadClient(): Promise<RegisteredClient | undefined>;
     private createLocalClient;
-    synchronizeClients(): Promise<MetaClient[]>;
+    /**
+     * Will download all the clients of the self user (excluding the current client) and will store them in the database
+     * @param currentClient - the id of the current client (to be excluded from the list)
+     */
+    synchronizeClients(currentClient: string): Promise<MetaClient[]>;
     register(loginData: LoginData, clientInfo: ClientInfo, { prekeys, lastPrekey }: InitialPrekeys): Promise<RegisteredClient>;
 }
 //# sourceMappingURL=ClientService.d.ts.map

package/lib/client/ClientService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ClientService.d.ts","sourceRoot":"","sources":["../../src/client/ClientService.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,SAAS,EAAC,MAAM,+BAA+B,CAAC;AACxD,OAAO,EAAkC,gBAAgB,EAAC,MAAM,iCAAiC,CAAC;AAMlG,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAC;AAEjD,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAC,cAAc,EAAC,MAAM,2DAA2D,CAAC;AAEzF,OAAO,EAAC,UAAU,EAAoD,MAAM,IAAI,CAAC;AAEjF,MAAM,WAAW,UAAW,SAAQ,gBAAgB;IAClD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE;QACJ,WAAW,CAAC,EAAE,OAAO,CAAC;QACtB,WAAW,EAAE,MAAM,CAAC;KACrB,CAAC;CACH;AAED,qBAAa,aAAa;IAStB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAV9B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA2B;IACpD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA0B;IAClD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAGpB;gBAGgB,SAAS,EAAE,SAAS,EACpB,cAAc,EAAE,cAAc,EAC9B,WAAW,EAAE,UAAU;IAMnC,UAAU,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAIhD;;;;;;;OAOG;IACU,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAMhF;;;OAGG;IACU,iBAAiB,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;YASpD,cAAc;IAQ5B;;;;;;OAMG;IACU,UAAU,IAAI,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;IA2BhE,OAAO,CAAC,iBAAiB;IAIZ,kBAAkB,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;IAW3C,QAAQ,CACnB,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,UAAU,EACtB,EAAC,OAAO,EAAE,UAAU,EAAC,EAAE,cAAc,GACpC,OAAO,CAAC,gBAAgB,CAAC;CA4B7B"}
+{"version":3,"file":"ClientService.d.ts","sourceRoot":"","sources":["../../src/client/ClientService.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,SAAS,EAAC,MAAM,+BAA+B,CAAC;AACxD,OAAO,EAAkC,gBAAgB,EAAC,MAAM,iCAAiC,CAAC;AAMlG,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAC;AAEjD,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAC,cAAc,EAAC,MAAM,2DAA2D,CAAC;AAEzF,OAAO,EAAC,UAAU,EAAoD,MAAM,IAAI,CAAC;AAEjF,MAAM,WAAW,UAAW,SAAQ,gBAAgB;IAClD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE;QACJ,WAAW,CAAC,EAAE,OAAO,CAAC;QACtB,WAAW,EAAE,MAAM,CAAC;KACrB,CAAC;CACH;AAED,qBAAa,aAAa;IAStB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAV9B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA2B;IACpD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA0B;IAClD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAGpB;gBAGgB,SAAS,EAAE,SAAS,EACpB,cAAc,EAAE,cAAc,EAC9B,WAAW,EAAE,UAAU;IAMnC,UAAU,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAIhD;;;;;;;OAOG;IACU,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAMhF;;;OAGG;IACU,iBAAiB,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;YASpD,cAAc;IAQ5B;;;;;;OAMG;IACU,UAAU,IAAI,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;IA0BhE,OAAO,CAAC,iBAAiB;IAIzB;;;OAGG;IACU,kBAAkB,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;IAUhE,QAAQ,CACnB,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,UAAU,EACtB,EAAC,OAAO,EAAE,UAAU,EAAC,EAAE,cAAc,GACpC,OAAO,CAAC,gBAAgB,CAAC;CA4B7B"}

package/lib/client/ClientService.js

@@ -36,7 +36,7 @@ class ClientService {
             logger: console,
             markdown: false,
         });
-        this.database = new _1.ClientDatabaseRepository(this.storeEngine, this.apiClient.backendFeatures.federationEndpoints);
+        this.database = new _1.ClientDatabaseRepository(this.storeEngine);
         this.backend = new _1.ClientBackendRepository(this.apiClient);
     }
     getClients() {
@@ -98,14 +98,12 @@ class ClientService {
             if (notFoundOnBackend && this.storeEngine) {
                 this.logger.log('Could not find valid client on backend');
                 const shouldDeleteWholeDatabase = loadedClient.type === client_1.ClientType.TEMPORARY;
+                this.logger.log('Deleting previous identity');
+                await this.proteusService.wipe(this.storeEngine);
                 if (shouldDeleteWholeDatabase) {
-                    this.logger.log('Last client was temporary - Deleting database');
+                    this.logger.log('Last client was temporary - Deleting content database');
                     await this.storeEngine.clearTables();
                 }
-                else {
-                    this.logger.log('Last client was permanent - Deleting previous identity');
-                    await this.proteusService.wipe(this.storeEngine);
-                }
             }
         }
         return undefined;
@@ -113,11 +111,15 @@ class ClientService {
     createLocalClient(client, domain) {
         return this.database.createLocalClient(client, domain);
     }
-    async synchronizeClients() {
+    /**
+     * Will download all the clients of the self user (excluding the current client) and will store them in the database
+     * @param currentClient - the id of the current client (to be excluded from the list)
+     */
+    async synchronizeClients(currentClient) {
         var _a;
         const registeredClients = await this.backend.getClients();
-        const filteredClients = registeredClients.filter(client => client.id !== this.apiClient.context.clientId);
-        return this.database.createClientList(this.apiClient.context.userId, filteredClients, (_a = this.apiClient.context) === null || _a === void 0 ? void 0 : _a.domain);
+        const filteredClients = registeredClients.filter(client => client.id !== currentClient);
+        return this.database.createClientList({ id: this.apiClient.context.userId, domain: (_a = this.apiClient.context.domain) !== null && _a !== void 0 ? _a : '' }, filteredClients);
     }
     // TODO: Split functionality into "create" and "register" client
     async register(loginData, clientInfo, { prekeys, lastPrekey }) {

package/lib/connection/ConnectionService.d.ts

@@ -5,8 +5,8 @@ export declare class ConnectionService {
     private readonly apiClient;
     constructor(apiClient: APIClient);
     getConnections(): Promise<Connection[]>;
-    acceptConnection(userId: string): Promise<Connection>;
-    ignoreConnection(userId: string): Promise<Connection>;
+    acceptConnection(userId: QualifiedId): Promise<Connection>;
+    ignoreConnection(userId: QualifiedId): Promise<Connection>;
     createConnection(userId: QualifiedId): Promise<Connection>;
 }
 //# sourceMappingURL=ConnectionService.d.ts.map

package/lib/connection/ConnectionService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ConnectionService.d.ts","sourceRoot":"","sources":["../../src/connection/ConnectionService.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,UAAU,EAAmB,MAAM,qCAAqC,CAAC;AACjF,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AAEzD,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAE9C,qBAAa,iBAAiB;IAChB,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,EAAE,SAAS;IAE1C,cAAc,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;IAIvC,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IAMrD,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IAMrD,gBAAgB,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC;CAGlE"}
+{"version":3,"file":"ConnectionService.d.ts","sourceRoot":"","sources":["../../src/connection/ConnectionService.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,UAAU,EAAmB,MAAM,qCAAqC,CAAC;AACjF,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AAEzD,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAE9C,qBAAa,iBAAiB;IAChB,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,EAAE,SAAS;IAE1C,cAAc,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;IAIvC,gBAAgB,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC;IAM1D,gBAAgB,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC;IAM1D,gBAAgB,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC;CAGlE"}

package/lib/connection/ConnectionService.js

@@ -25,7 +25,7 @@ class ConnectionService {
         this.apiClient = apiClient;
     }
     getConnections() {
-        return this.apiClient.api.connection.getAllConnections();
+        return this.apiClient.api.connection.getConnectionList();
     }
     acceptConnection(userId) {
         return this.apiClient.api.connection.putConnection(userId, {
@@ -38,7 +38,7 @@ class ConnectionService {
         });
     }
     createConnection(userId) {
-        return this.apiClient.api.connection.postConnection(userId, '');
+        return this.apiClient.api.connection.postConnection(userId);
     }
 }
 exports.ConnectionService = ConnectionService;

package/lib/conversation/AssetTransferState.js

@@ -23,4 +23,4 @@ var AssetTransferState;
 (function (AssetTransferState) {
     AssetTransferState["NOT_UPLOADED"] = "notUploaded";
     AssetTransferState["UPLOADED"] = "uploaded";
-})(AssetTransferState = exports.AssetTransferState || (exports.AssetTransferState = {}));
+})(AssetTransferState || (exports.AssetTransferState = AssetTransferState = {}));

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

@@ -1,4 +1,4 @@
-import { Conversation, DefaultConversationRoleName, MutedStatus, NewConversation, QualifiedUserClients, UserClients, RemoteConversations } from '@wireapp/api-client/lib/conversation';
+import { Conversation, DefaultConversationRoleName, MutedStatus, NewConversation, QualifiedUserClients, RemoteConversations, PostMlsMessageResponse } from '@wireapp/api-client/lib/conversation';
 import { ConversationMemberLeaveEvent } from '@wireapp/api-client/lib/event';
 import { QualifiedId } from '@wireapp/api-client/lib/user';
 import { XOR } from '@wireapp/commons/lib/util/TypeUtil';
@@ -23,7 +23,7 @@ export declare class ConversationService {
      * @param {string} conversationId
      * @param {string} conversationDomain? - If given will send the message to the new qualified endpoint
      */
-    fetchAllParticipantsClients(conversationId: QualifiedId | string): Promise<UserClients | QualifiedUserClients>;
+    fetchAllParticipantsClients(conversationId: QualifiedId): Promise<QualifiedUserClients>;
     /**
      * Create a group conversation.
      *
@@ -63,11 +63,18 @@ export declare class ConversationService {
      * Will create a conversation on backend and register it to CoreCrypto once created
      * @param conversationData
      */
-    createMLSConversation(conversationData: NewConversation): Promise<MLSReturnType>;
+    createMLSConversation(conversationData: NewConversation, selfUserId: QualifiedId, selfClientId: string): Promise<MLSReturnType>;
     private sendMLSMessage;
-    addUsersToMLSConversation({ qualifiedUserIds, groupId, conversationId, }: Required<AddUsersParams>): Promise<MLSReturnType>;
+    /**
+     * Will add users to existing MLS group by claiming their key packages and passing them to CoreCrypto.addClientsToConversation
+     *
+     * @param qualifiedUsers List of qualified user ids (with optional skipOwnClientId field - if provided we will not claim key package for this self client)
+     * @param groupId Id of the group to which we want to add users
+     * @param conversationId Id of the conversation to which we want to add users
+     */
+    addUsersToMLSConversation({ qualifiedUsers, groupId, conversationId, }: Required<AddUsersParams>): Promise<MLSReturnType>;
     removeUsersFromMLSConversation({ groupId, conversationId, qualifiedUserIds, }: RemoveUsersParams): Promise<MLSReturnType>;
-    joinByExternalCommit(conversationId: QualifiedId): Promise<import("@wireapp/api-client/lib/conversation").PostMlsMessageResponse | null>;
+    joinByExternalCommit(conversationId: QualifiedId): Promise<PostMlsMessageResponse | null>;
     /**
      * 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.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ConversationService.d.ts","sourceRoot":"","sources":["../../../src/conversation/ConversationService/ConversationService.ts"],"names":[],"mappings":"AAmBA,OAAO,EACL,YAAY,EACZ,2BAA2B,EAC3B,WAAW,EACX,eAAe,EACf,oBAAoB,EACpB,WAAW,EAEX,mBAAmB,EACpB,MAAM,sCAAsC,CAAC;AAE9C,OAAO,EAAC,4BAA4B,EAAC,MAAM,+BAA+B,CAAC;AAC3E,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AACzD,OAAO,EAAC,GAAG,EAAC,MAAM,oCAAoC,CAAC;AAIvD,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAI9C,OAAO,EAAC,cAAc,EAAE,aAAa,EAAE,oBAAoB,EAAE,UAAU,EAAC,MAAM,6BAA6B,CAAC;AAE5G,OAAO,EAAC,YAAY,EAAuB,iBAAiB,EAAC,MAAM,qBAAqB,CAAC;AAEzF,OAAO,EAAC,UAAU,EAAuB,MAAM,8BAA8B,CAAC;AAC9E,OAAO,EAAkC,cAAc,EAAC,MAAM,kCAAkC,CAAC;AACjG,OAAO,EACL,mCAAmC,EACnC,wBAAwB,EACzB,MAAM,sEAAsE,CAAC;AAG9E,OAAO,EAAC,UAAU,EAAC,MAAM,YAAY,CAAC;AAGtC,qBAAa,mBAAmB;IAK5B,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC;IAN/B,SAAgB,YAAY,EAAE,YAAY,CAAC;IAC3C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAgD;gBAGpD,SAAS,EAAE,SAAS,EACpB,cAAc,EAAE,cAAc,EAC9B,WAAW,CAAC,wBAAY;IAK3C,IAAI,UAAU,IAAI,UAAU,CAK3B;IAED;;;;;OAKG;IACU,2BAA2B,CACtC,cAAc,EAAE,WAAW,GAAG,MAAM,GACnC,OAAO,CAAC,WAAW,GAAG,oBAAoB,CAAC;IAkB9C;;;;;;;;OAQG;IACU,yBAAyB,CAAC,gBAAgB,EAAE,eAAe,GAAG,OAAO,CAAC,YAAY,CAAC;IAQnF,eAAe,CAAC,cAAc,EAAE,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC;IAInE,gBAAgB,CAAC,eAAe,CAAC,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAO/E,QAAQ,CAAC,EAAC,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAC,EAAE,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;IAWhF,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IAK/E,6BAA6B,CAAC,MAAM,EAAE,mCAAmC;IAIzE,0BAA0B,CACrC,cAAc,EAAE,WAAW,EAC3B,MAAM,EAAE,WAAW,GAClB,OAAO,CAAC,4BAA4B,CAAC;IAIxC;;;OAGG;IACU,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,oBAAoB,EAAE,wBAAwB,CAAC,GAAG,OAAO,CAAC,UAAU,CAAC;IAO5F,eAAe,CAAC,cAAc,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAI3D,cAAc,CAAC,cAAc,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAIjE;;OAEG;IACH,gBAAgB,IAAI,OAAO;IAIpB,0BAA0B,CAC/B,cAAc,EAAE,MAAM,EACtB,MAAM,EAAE,WAAW,EACnB,aAAa,EAAE,MAAM,GAAG,IAAI,GAC3B,OAAO,CAAC,IAAI,CAAC;IAaT,yBAAyB,CAC9B,cAAc,EAAE,MAAM,EACtB,QAAQ,EAAE,OAAO,EACjB,gBAAgB,GAAE,MAAM,GAAG,IAAiB,GAC3C,OAAO,CAAC,IAAI,CAAC;IAaT,yBAAyB,CAC9B,cAAc,EAAE,MAAM,EACtB,MAAM,EAAE,MAAM,EACd,gBAAgB,EAAE,2BAA2B,GAAG,MAAM,GACrD,OAAO,CAAC,IAAI,CAAC;IAMhB;;;;OAIG;IAEH;;;OAGG;IACU,qBAAqB,CAAC,gBAAgB,EAAE,eAAe,GAAG,OAAO,CAAC,aAAa,CAAC;YAmC/E,cAAc;IAqBf,yBAAyB,CAAC,EACrC,gBAAgB,EAChB,OAAO,EACP,cAAc,GACf,EAAE,QAAQ,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,aAAa,CAAC;IAcvC,8BAA8B,CAAC,EAC1C,OAAO,EACP,cAAc,EACd,gBAAgB,GACjB,EAAE,iBAAiB,GAAG,OAAO,CAAC,aAAa,CAAC;IAoBhC,oBAAoB,CAAC,cAAc,EAAE,WAAW;IAI7D;;;;;OAKG;IACU,wBAAwB,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;IAiBvD,4BAA4B,CAAC,OAAO,EAAE,MAAM;IAI5C,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;YAIlD,YAAY;IAYb,mBAAmB;CA2BjC"}
+{"version":3,"file":"ConversationService.d.ts","sourceRoot":"","sources":["../../../src/conversation/ConversationService/ConversationService.ts"],"names":[],"mappings":"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"}