@wireapp/core 38.3.3 → 38.4.0

package/lib/messagingProtocols/proteus/ProteusService/ProteusService.types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ProteusService.types.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/proteus/ProteusService/ProteusService.types.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,MAAM,EAAC,MAAM,8BAA8B,CAAC;AACpD,OAAO,EACL,WAAW,EACX,oBAAoB,EACpB,cAAc,EACd,oBAAoB,EACpB,oBAAoB,EACpB,eAAe,EAChB,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AAEzD,OAAO,EAAC,cAAc,EAAE,qBAAqB,EAAE,gBAAgB,EAAC,MAAM,uBAAuB,CAAC;AAE9F,MAAM,WAAW,SAAS;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,WAAW,CAAC;CACrB;AACD,MAAM,MAAM,oBAAoB,GAAG;IACjC,eAAe,EAAE,OAAO,CAAC;IACzB,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE,SAAS,KAAK,IAAI,CAAC;IAC1C,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;CAC3C,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAAC,OAAO,EAAE,MAAM,EAAE,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAC,CAAC;AAEvE,MAAM,MAAM,wBAAwB,GAAG,gBAAgB,GACrD,qBAAqB,GAAG;IACtB,cAAc,EAAE,WAAW,CAAC;IAE5B;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,MAAM,EAAE,GAAG,WAAW,EAAE,GAAG,WAAW,GAAG,oBAAoB,CAAC;IACxE,gBAAgB,CAAC,EAAE,CACjB,MAAM,EAAE,cAAc,GAAG,oBAAoB,EAC7C,OAAO,EAAE,OAAO,KACb,IAAI,GAAG,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACvC,QAAQ,EAAE,oBAAoB,CAAC,OAAO,CAAC;CACxC,CAAC;AAEJ,MAAM,MAAM,+BAA+B,GAAG;IAC5C,gBAAgB,EAAE,eAAe,GAAG,MAAM,CAAC;IAC3C,YAAY,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;CAClC,CAAC;AAEF,MAAM,MAAM,mCAAmC,GAAG,IAAI,CAAC,cAAc,EAAE,SAAS,CAAC,CAAC"}
+{"version":3,"file":"ProteusService.types.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/proteus/ProteusService/ProteusService.types.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,MAAM,EAAC,MAAM,8BAA8B,CAAC;AACpD,OAAO,EACL,WAAW,EACX,oBAAoB,EACpB,cAAc,EACd,oBAAoB,EACpB,oBAAoB,EACpB,eAAe,EAChB,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AAEzD,OAAO,EAAC,cAAc,EAAE,qBAAqB,EAAE,gBAAgB,EAAC,MAAM,uBAAuB,CAAC;AAE9F,MAAM,WAAW,SAAS;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,WAAW,CAAC;CACrB;AACD,MAAM,MAAM,oBAAoB,GAAG;IACjC,eAAe,EAAE,OAAO,CAAC;IACzB,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE,SAAS,KAAK,IAAI,CAAC;IAC1C,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;CAC3C,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG,gBAAgB,GACrD,qBAAqB,GAAG;IACtB,cAAc,EAAE,WAAW,CAAC;IAE5B;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,MAAM,EAAE,GAAG,WAAW,EAAE,GAAG,WAAW,GAAG,oBAAoB,CAAC;IACxE,gBAAgB,CAAC,EAAE,CACjB,MAAM,EAAE,cAAc,GAAG,oBAAoB,EAC7C,OAAO,EAAE,OAAO,KACb,IAAI,GAAG,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACvC,QAAQ,EAAE,oBAAoB,CAAC,OAAO,CAAC;CACxC,CAAC;AAEJ,MAAM,MAAM,+BAA+B,GAAG;IAC5C,gBAAgB,EAAE,eAAe,GAAG,MAAM,CAAC;IAC3C,YAAY,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;CAClC,CAAC;AAEF,MAAM,MAAM,mCAAmC,GAAG,IAAI,CAAC,cAAc,EAAE,SAAS,CAAC,CAAC"}

package/lib/messagingProtocols/proteus/ProteusService/cryptoMigrationStateStore.d.ts

@@ -0,0 +1,11 @@
+export declare const cryptoMigrationStore: {
+    qualifiedSessions: {
+        isReady: (dbName: string) => boolean;
+        markAsReady: (dbName: string) => void;
+    };
+    coreCrypto: {
+        isReady: (dbName: string) => boolean;
+        markAsReady: (dbName: string) => void;
+    };
+};
+//# sourceMappingURL=cryptoMigrationStateStore.d.ts.map

package/lib/messagingProtocols/proteus/ProteusService/cryptoMigrationStateStore.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cryptoMigrationStateStore.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/proteus/ProteusService/cryptoMigrationStateStore.ts"],"names":[],"mappings":"AA6CA,eAAO,MAAM,oBAAoB;;0BAPyC,MAAM;8BANJ,MAAM;;;0BAMR,MAAM;8BANJ,MAAM;;CAsBjF,CAAC"}

package/lib/messagingProtocols/proteus/ProteusService/cryptoMigrationStateStore.js

@@ -0,0 +1,53 @@
+"use strict";
+/*
+ * Wire
+ * Copyright (C) 2022 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.cryptoMigrationStore = void 0;
+function getLocalStorage() {
+    try {
+        return window.localStorage;
+    }
+    catch (_a) {
+        return { setItem: () => { }, getItem: () => { }, removeItem: () => { } };
+    }
+}
+const MIGRATION_READY_STATE = '1';
+const getQualifiedSessionsReadyKey = (dbName) => `${dbName}-qualified-sessions-ready`;
+const getCoreCryptoReadyKey = (dbName) => `${dbName}-corecrypto-ready`;
+const markMigrationReady = (getKey) => (dbName) => {
+    const key = getKey(dbName);
+    const localStorage = getLocalStorage();
+    localStorage.setItem(key, MIGRATION_READY_STATE);
+};
+const isMigrationReady = (getKey) => (dbName) => {
+    const key = getKey(dbName);
+    const localStorage = getLocalStorage();
+    const value = localStorage.getItem(key);
+    return !!value && value === MIGRATION_READY_STATE;
+};
+exports.cryptoMigrationStore = {
+    qualifiedSessions: {
+        isReady: isMigrationReady(getQualifiedSessionsReadyKey),
+        markAsReady: markMigrationReady(getQualifiedSessionsReadyKey),
+    },
+    coreCrypto: {
+        isReady: isMigrationReady(getCoreCryptoReadyKey),
+        markAsReady: markMigrationReady(getCoreCryptoReadyKey),
+    },
+};

package/lib/messagingProtocols/proteus/Utility/SessionHandler/SessionHandler.d.ts

@@ -1,9 +1,9 @@
 import { PreKey } from '@wireapp/api-client/lib/auth';
 import { UserClients } from '@wireapp/api-client/lib/conversation';
 import { QualifiedId, UserPreKeyBundleMap } from '@wireapp/api-client/lib/user';
-import { CoreCrypto } from '@wireapp/core-crypto/platforms/web/corecrypto';
 import { Logger } from 'logdown';
 import { APIClient } from '@wireapp/api-client';
+import { CryptoClient } from '../../ProteusService/CryptoClient';
 interface ConstructSessionIdParams {
     userId: string | QualifiedId;
     clientId: string;
@@ -12,32 +12,32 @@ interface ConstructSessionIdParams {
 }
 declare const constructSessionId: ({ userId, clientId, useQualifiedIds, domain }: ConstructSessionIdParams) => string;
 /**
- * Will make sure the session is available in coreCrypto
+ * Will make sure the session is available in cryptoClient
  * @param sessionId the session to init
  */
 declare const initSession: ({ userId, clientId, initialPrekey }: {
     userId: QualifiedId;
     clientId: string;
     initialPrekey?: PreKey | undefined;
-}, { coreCrypto, apiClient }: {
+}, { cryptoClient, apiClient }: {
     apiClient: APIClient;
-    coreCrypto: CoreCrypto;
+    cryptoClient: CryptoClient;
 }) => Promise<string>;
 interface GetSessionsAndClientsFromRecipientsProps {
     recipients: UserClients | UserPreKeyBundleMap;
     domain?: string;
     apiClient: APIClient;
-    coreCrypto: CoreCrypto;
+    cryptoClient: CryptoClient;
     logger?: Logger;
 }
 /**
  * Will make sure all the sessions need to encrypt for those user/clients pair are set
  */
-declare const initSessions: ({ recipients, domain, apiClient, coreCrypto, logger, }: GetSessionsAndClientsFromRecipientsProps) => Promise<string[]>;
+declare const initSessions: ({ recipients, domain, apiClient, cryptoClient, logger, }: GetSessionsAndClientsFromRecipientsProps) => Promise<string[]>;
 interface DeleteSessionParams {
     userId: QualifiedId;
     clientId: string;
-    coreCrypto: CoreCrypto;
+    cryptoClient: CryptoClient;
     useQualifiedIds: boolean;
 }
 declare function deleteSession(params: DeleteSessionParams): Promise<void>;

package/lib/messagingProtocols/proteus/Utility/SessionHandler/SessionHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SessionHandler.d.ts","sourceRoot":"","sources":["../../../../../src/messagingProtocols/proteus/Utility/SessionHandler/SessionHandler.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,MAAM,EAAC,MAAM,8BAA8B,CAAC;AACpD,OAAO,EAAC,WAAW,EAAC,MAAM,sCAAsC,CAAC;AACjE,OAAO,EAAC,WAAW,EAAE,mBAAmB,EAAC,MAAM,8BAA8B,CAAC;AAC9E,OAAO,EAAC,UAAU,EAAC,MAAM,+CAA+C,CAAC;AAEzE,OAAO,EAAC,MAAM,EAAC,MAAM,SAAS,CAAC;AAE/B,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAM9C,UAAU,wBAAwB;IAChC,MAAM,EAAE,MAAM,GAAG,WAAW,CAAC;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,OAAO,CAAC;IACzB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,QAAA,MAAM,kBAAkB,kDAAiD,wBAAwB,KAAG,MAKnG,CAAC;AAsGF;;;GAGG;AACH,QAAA,MAAM,WAAW;YAC6B,WAAW;cAAY,MAAM;;;eACpC,SAAS;gBAAc,UAAU;MACrE,QAAQ,MAAM,CAYhB,CAAC;AAyBF,UAAU,wCAAwC;IAChD,UAAU,EAAE,WAAW,GAAG,mBAAmB,CAAC;IAC9C,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,UAAU,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,QAAA,MAAM,YAAY,2DAMf,wCAAwC,KAAG,QAAQ,MAAM,EAAE,CAgC7D,CAAC;AAEF,UAAU,mBAAmB;IAC3B,MAAM,EAAE,WAAW,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,UAAU,CAAC;IACvB,eAAe,EAAE,OAAO,CAAC;CAC1B;AACD,iBAAS,aAAa,CAAC,MAAM,EAAE,mBAAmB,iBAGjD;AA+CD,KAAK,iBAAiB,CAAC,CAAC,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC;AAC9D;;GAEG;AACH,QAAA,MAAM,sBAAsB,uDAO3B,CAAC;AAEF,OAAO,EAAC,kBAAkB,EAAE,WAAW,EAAE,YAAY,EAAE,aAAa,EAAE,sBAAsB,EAAC,CAAC"}
+{"version":3,"file":"SessionHandler.d.ts","sourceRoot":"","sources":["../../../../../src/messagingProtocols/proteus/Utility/SessionHandler/SessionHandler.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,MAAM,EAAC,MAAM,8BAA8B,CAAC;AACpD,OAAO,EAAC,WAAW,EAAC,MAAM,sCAAsC,CAAC;AACjE,OAAO,EAAC,WAAW,EAAE,mBAAmB,EAAC,MAAM,8BAA8B,CAAC;AAE9E,OAAO,EAAC,MAAM,EAAC,MAAM,SAAS,CAAC;AAE/B,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAK9C,OAAO,EAAC,YAAY,EAAC,MAAM,mCAAmC,CAAC;AAE/D,UAAU,wBAAwB;IAChC,MAAM,EAAE,MAAM,GAAG,WAAW,CAAC;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,OAAO,CAAC;IACzB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,QAAA,MAAM,kBAAkB,kDAAiD,wBAAwB,KAAG,MAKnG,CAAC;AA2GF;;;GAGG;AACH,QAAA,MAAM,WAAW;YAC6B,WAAW;cAAY,MAAM;;;eAClC,SAAS;kBAAgB,YAAY;MAC3E,QAAQ,MAAM,CAYhB,CAAC;AAyBF,UAAU,wCAAwC;IAChD,UAAU,EAAE,WAAW,GAAG,mBAAmB,CAAC;IAC9C,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,SAAS,CAAC;IACrB,YAAY,EAAE,YAAY,CAAC;IAC3B,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,QAAA,MAAM,YAAY,6DAMf,wCAAwC,KAAG,QAAQ,MAAM,EAAE,CAgC7D,CAAC;AAEF,UAAU,mBAAmB;IAC3B,MAAM,EAAE,WAAW,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,YAAY,CAAC;IAC3B,eAAe,EAAE,OAAO,CAAC;CAC1B;AACD,iBAAe,aAAa,CAAC,MAAM,EAAE,mBAAmB,iBAGvD;AA+CD,KAAK,iBAAiB,CAAC,CAAC,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC;AAC9D;;GAEG;AACH,QAAA,MAAM,sBAAsB,uDAO3B,CAAC;AAEF,OAAO,EAAC,kBAAkB,EAAE,WAAW,EAAE,YAAY,EAAE,aAAa,EAAE,sBAAsB,EAAC,CAAC"}

package/lib/messagingProtocols/proteus/Utility/SessionHandler/SessionHandler.js

@@ -43,19 +43,19 @@ const parseSessionId = (sessionId) => {
     }
     return match.groups;
 };
-const createSession = async ({ sessionId, initialPrekey, coreCrypto, apiClient }) => {
+const createSession = async ({ sessionId, initialPrekey, cryptoClient, apiClient, }) => {
     const { userId, clientId, domain } = parseSessionId(sessionId);
     const prekey = initialPrekey !== null && initialPrekey !== void 0 ? initialPrekey : (await apiClient.api.user.getClientPreKey({ id: userId, domain: domain !== null && domain !== void 0 ? domain : '' }, clientId)).prekey;
     const prekeyBuffer = bazinga64_1.Decoder.fromBase64(prekey.key).asBytes;
-    await coreCrypto.proteusSessionFromPrekey(sessionId, prekeyBuffer);
-    await coreCrypto.proteusSessionSave(sessionId);
+    await cryptoClient.sessionFromPrekey(sessionId, prekeyBuffer);
+    await cryptoClient.saveSession(sessionId);
 };
-const createLegacySessions = async ({ userClients, apiClient, coreCrypto, logger, }) => {
+const createLegacySessions = async ({ userClients, apiClient, cryptoClient, logger, }) => {
     const preKeyBundleMap = await apiClient.api.user.postMultiPreKeyBundles(userClients);
     const sessions = await createSessionsFromPreKeys({
         preKeyBundleMap,
         useQualifiedIds: false,
-        coreCrypto,
+        cryptoClient,
         logger,
     });
     return sessions;
@@ -64,7 +64,7 @@ const createLegacySessions = async ({ userClients, apiClient, coreCrypto, logger
  * Create sessions for the qualified clients.
  * @param {userClientMap} map of domain to (map of user IDs to client IDs)
  */
-const createQualifiedSessions = async ({ userClientMap, domain, apiClient, coreCrypto, logger, }) => {
+const createQualifiedSessions = async ({ userClientMap, domain, apiClient, cryptoClient, logger, }) => {
     const prekeyBundleMap = await apiClient.api.user.postQualifiedMultiPreKeyBundles({ [domain]: userClientMap });
     const sessions = [];
     for (const domain in prekeyBundleMap) {
@@ -73,7 +73,7 @@ const createQualifiedSessions = async ({ userClientMap, domain, apiClient, coreC
             preKeyBundleMap: domainUsers,
             domain,
             useQualifiedIds: true,
-            coreCrypto,
+            cryptoClient,
             logger,
         });
         sessions.push(...domainSessions);
@@ -81,18 +81,18 @@ const createQualifiedSessions = async ({ userClientMap, domain, apiClient, coreC
     return sessions;
 };
 /**
- * Will make sure the session is available in coreCrypto
+ * Will make sure the session is available in cryptoClient
  * @param sessionId the session to init
  */
-const initSession = async ({ userId, clientId, initialPrekey }, { coreCrypto, apiClient }) => {
+const initSession = async ({ userId, clientId, initialPrekey }, { cryptoClient, apiClient }) => {
     const sessionId = constructSessionId({ userId, clientId, useQualifiedIds: !!userId.domain });
-    const sessionExists = await coreCrypto.proteusSessionExists(sessionId);
+    const sessionExists = await cryptoClient.sessionExists(sessionId);
     if (!sessionExists) {
         await createSession({
             sessionId,
             initialPrekey,
             apiClient: apiClient,
-            coreCrypto,
+            cryptoClient,
         });
     }
     return sessionId;
@@ -103,21 +103,21 @@ exports.initSession = initSession;
  * Will call createQualifiedSessions or createLegacySessions based on passed userClientMap.
  * @param {userClientMap} map of domain to (map of user IDs to client IDs) or map of user IDs containg the lists of clients
  */
-const createSessions = async ({ userClientMap, domain, apiClient, coreCrypto, logger, }) => {
+const createSessions = async ({ userClientMap, domain, apiClient, cryptoClient, logger, }) => {
     if (domain) {
-        return await createQualifiedSessions({ userClientMap, domain, apiClient, coreCrypto, logger });
+        return await createQualifiedSessions({ userClientMap, domain, apiClient, cryptoClient, logger });
     }
     return await createLegacySessions({
         userClients: userClientMap,
         apiClient,
-        coreCrypto,
+        cryptoClient,
         logger,
     });
 };
 /**
  * Will make sure all the sessions need to encrypt for those user/clients pair are set
  */
-const initSessions = async ({ recipients, domain = '', apiClient, coreCrypto, logger, }) => {
+const initSessions = async ({ recipients, domain = '', apiClient, cryptoClient, logger, }) => {
     const missingUserClients = {};
     const existingSessions = [];
     const users = (0, UserClientsUtil_1.flattenUserClients)(recipients, domain);
@@ -126,7 +126,7 @@ const initSessions = async ({ recipients, domain = '', apiClient, coreCrypto, lo
         const clients = Array.isArray(data) ? data : Object.keys(data);
         for (const clientId of clients) {
             const sessionId = constructSessionId({ userId, clientId, useQualifiedIds: !!domain });
-            if (await coreCrypto.proteusSessionExists(sessionId)) {
+            if (await cryptoClient.sessionExists(sessionId)) {
                 existingSessions.push(sessionId);
                 continue;
             }
@@ -141,18 +141,18 @@ const initSessions = async ({ recipients, domain = '', apiClient, coreCrypto, lo
         userClientMap: missingUserClients,
         domain,
         apiClient,
-        coreCrypto,
+        cryptoClient,
         logger,
     });
     return [...existingSessions, ...newSessions];
 };
 exports.initSessions = initSessions;
-function deleteSession(params) {
+async function deleteSession(params) {
     const sessionId = constructSessionId(params);
-    return params.coreCrypto.proteusSessionDelete(sessionId);
+    await params.cryptoClient.deleteSession(sessionId);
 }
 exports.deleteSession = deleteSession;
-const createSessionsFromPreKeys = async ({ preKeyBundleMap, domain = '', useQualifiedIds, coreCrypto, logger, }) => {
+const createSessionsFromPreKeys = async ({ preKeyBundleMap, domain = '', useQualifiedIds, cryptoClient, logger, }) => {
     const sessions = [];
     for (const userId in preKeyBundleMap) {
         const userClients = preKeyBundleMap[userId];
@@ -164,8 +164,8 @@ const createSessionsFromPreKeys = async ({ preKeyBundleMap, domain = '', useQual
                 continue;
             }
             const prekeyBuffer = bazinga64_1.Decoder.fromBase64(prekey.key).asBytes;
-            await coreCrypto.proteusSessionFromPrekey(sessionId, prekeyBuffer);
-            await coreCrypto.proteusSessionSave(sessionId);
+            await cryptoClient.sessionFromPrekey(sessionId, prekeyBuffer);
+            await cryptoClient.saveSession(sessionId);
             sessions.push(sessionId);
         }
     }

package/lib/messagingProtocols/proteus/Utility/SessionHandler/SessionHandler.test.js

@@ -19,6 +19,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 const SessionHandler_1 = require("./SessionHandler");
+const CryptoClient_1 = require("../../ProteusService/CryptoClient");
 const ProteusService_mocks_1 = require("../../ProteusService/ProteusService.mocks");
 describe('SessionHandler', () => {
     describe('constructSessionId', () => {
@@ -68,7 +69,7 @@ describe('SessionHandler', () => {
             const { apiClient, coreCrypto } = (await (0, ProteusService_mocks_1.buildProteusService)())[1];
             jest.spyOn(coreCrypto, 'proteusSessionExists').mockResolvedValue(true);
             const sessionFromPrekeySpy = jest.spyOn(coreCrypto, 'proteusSessionFromPrekey');
-            await (0, SessionHandler_1.initSession)({ userId: { id: 'user1', domain: 'domain' }, clientId: 'client1' }, { apiClient, coreCrypto });
+            await (0, SessionHandler_1.initSession)({ userId: { id: 'user1', domain: 'domain' }, clientId: 'client1' }, { apiClient, cryptoClient: (0, CryptoClient_1.wrapCryptoClient)(coreCrypto, {}, {}) });
             expect(sessionFromPrekeySpy).not.toHaveBeenCalled();
         });
         it('creates the session if it does not already exist', async () => {
@@ -87,7 +88,7 @@ describe('SessionHandler', () => {
                 useQualifiedIds: true,
             });
             const sessionFromPrekeySpy = jest.spyOn(coreCrypto, 'proteusSessionFromPrekey');
-            await (0, SessionHandler_1.initSession)({ userId: { id: 'user1', domain: 'domain' }, clientId: 'client1' }, { apiClient, coreCrypto });
+            await (0, SessionHandler_1.initSession)({ userId: { id: 'user1', domain: 'domain' }, clientId: 'client1' }, { apiClient, cryptoClient: (0, CryptoClient_1.wrapCryptoClient)(coreCrypto, {}, {}) });
             expect(sessionFromPrekeySpy).toHaveBeenCalledWith(sessionId, expect.any(Object));
         });
     });
@@ -128,7 +129,7 @@ describe('SessionHandler', () => {
             const sessions = await (0, SessionHandler_1.initSessions)({
                 recipients: Object.assign(Object.assign({}, existingUserClients), missingUserClients),
                 apiClient,
-                coreCrypto,
+                cryptoClient: (0, CryptoClient_1.wrapCryptoClient)(coreCrypto, {}, {}),
             });
             expect(sessionFromPrekeySpy).toHaveBeenCalledTimes(3);
             expect(sessions).toHaveLength(6);

package/lib/notification/NotificationService.d.ts

@@ -27,14 +27,14 @@ export interface NotificationService {
     on(event: TOPIC.NOTIFICATION_ERROR, listener: (payload: NotificationError) => void): this;
 }
 export declare class NotificationService extends EventEmitter {
-    private readonly mlsService;
     private readonly proteusService;
+    private readonly mlsService?;
     private readonly apiClient;
     private readonly backend;
     private readonly database;
     private readonly logger;
     static readonly TOPIC: typeof TOPIC;
-    constructor(apiClient: APIClient, mlsService: MLSService, proteusService: ProteusService, storeEngine: CRUDEngine);
+    constructor(apiClient: APIClient, proteusService: ProteusService, storeEngine: CRUDEngine, mlsService?: MLSService | undefined);
     private getAllNotifications;
     /** Should only be called with a completely new client. */
     initializeNotificationStream(): Promise<string>;

package/lib/notification/NotificationService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NotificationService.d.ts","sourceRoot":"","sources":["../../src/notification/NotificationService.ts"],"names":[],"mappings":";AAmBA,OAAO,EAAC,YAAY,EAAqB,MAAM,+BAA+B,CAAC;AAC/E,OAAO,EAAC,YAAY,EAAC,MAAM,uCAAuC,CAAC;AACnE,OAAO,EAAC,YAAY,EAAC,MAAM,6BAA6B,CAAC;AAGzD,OAAO,EAAC,YAAY,EAAC,MAAM,QAAQ,CAAC;AAEpC,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAC,cAAc,EAAC,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAC,UAAU,EAA4B,MAAM,uBAAuB,CAAC;AAI5E,OAAO,EAAC,kBAAkB,EAAC,MAAM,uBAAuB,CAAC;AAEzD,OAAO,EAAY,iBAAiB,EAAC,MAAM,cAAc,CAAC;AAC1D,OAAO,EAAC,eAAe,EAAC,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAC,UAAU,EAAC,MAAM,2BAA2B,CAAC;AACrD,OAAO,EAAC,cAAc,EAAC,MAAM,+BAA+B,CAAC;AAE7D,MAAM,MAAM,mBAAmB,GAAG;IAChC,KAAK,EAAE,YAAY,CAAC;IACpB,aAAa,CAAC,EAAE,cAAc,CAAC;IAC/B,eAAe,CAAC,EAAE,eAAe,CAAC;CACnC,CAAC;AAEF,aAAK,KAAK;IACR,kBAAkB,iDAAiD;CACpE;AAED,MAAM,MAAM,mBAAmB,GAAG,CAChC,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,kBAAkB,EAC1B,QAAQ,EAAE;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAC,KACpC,OAAO,CAAC,IAAI,CAAC,CAAC;AAEnB,MAAM,WAAW,mBAAmB;IAClC,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,kBAAkB,EAAE,QAAQ,EAAE,CAAC,OAAO,EAAE,iBAAiB,KAAK,IAAI,GAAG,IAAI,CAAC;CAC3F;AAED,qBAAa,mBAAoB,SAAQ,YAAY;IAYjD,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,cAAc;IAZjC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAY;IACtC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAgC;IACxD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAiC;IAC1D,OAAO,CAAC,QAAQ,CAAC,MAAM,CAGpB;IACH,gBAAuB,KAAK,eAAS;gBAGnC,SAAS,EAAE,SAAS,EACH,UAAU,EAAE,UAAU,EACtB,cAAc,EAAE,cAAc,EAC/C,WAAW,EAAE,UAAU;YAQX,mBAAmB;IAKjC,0DAA0D;IAC7C,4BAA4B,IAAI,OAAO,CAAC,MAAM,CAAC;IAO/C,UAAU,IAAI,OAAO,CAAC,OAAO,CAAC;IAKpC,wBAAwB,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;IAI7C,gBAAgB,CAAC,SAAS,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;YAsB/C,qBAAqB;IAItB,yBAAyB,CACpC,mBAAmB,EAAE,mBAAmB,EACxC,qBAAqB,EAAE,CAAC,cAAc,EAAE,MAAM,KAAK,IAAI,EACvD,YAAY,EAAE,YAAY,GACzB,OAAO,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAC,CAAC;IAoC3D;;;;;;;OAOG;IACH,OAAO,CAAC,eAAe;IAYT,kBAAkB,CAC9B,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,kBAAkB,EAC1B,MAAM,GAAE,OAAe,GACtB,cAAc,CAAC,mBAAmB,CAAC;IAmCtC;;;;;;OAMG;YACW,WAAW;CAmC1B"}
+{"version":3,"file":"NotificationService.d.ts","sourceRoot":"","sources":["../../src/notification/NotificationService.ts"],"names":[],"mappings":";AAmBA,OAAO,EAAC,YAAY,EAAqB,MAAM,+BAA+B,CAAC;AAC/E,OAAO,EAAC,YAAY,EAAC,MAAM,uCAAuC,CAAC;AACnE,OAAO,EAAC,YAAY,EAAC,MAAM,6BAA6B,CAAC;AAGzD,OAAO,EAAC,YAAY,EAAC,MAAM,QAAQ,CAAC;AAEpC,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAC,cAAc,EAAC,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAC,UAAU,EAA4B,MAAM,uBAAuB,CAAC;AAI5E,OAAO,EAAC,kBAAkB,EAAC,MAAM,uBAAuB,CAAC;AAEzD,OAAO,EAAY,iBAAiB,EAAC,MAAM,cAAc,CAAC;AAC1D,OAAO,EAAC,eAAe,EAAC,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAC,UAAU,EAAC,MAAM,2BAA2B,CAAC;AACrD,OAAO,EAAC,cAAc,EAAC,MAAM,+BAA+B,CAAC;AAE7D,MAAM,MAAM,mBAAmB,GAAG;IAChC,KAAK,EAAE,YAAY,CAAC;IACpB,aAAa,CAAC,EAAE,cAAc,CAAC;IAC/B,eAAe,CAAC,EAAE,eAAe,CAAC;CACnC,CAAC;AAEF,aAAK,KAAK;IACR,kBAAkB,iDAAiD;CACpE;AAED,MAAM,MAAM,mBAAmB,GAAG,CAChC,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,kBAAkB,EAC1B,QAAQ,EAAE;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAC,KACpC,OAAO,CAAC,IAAI,CAAC,CAAC;AAEnB,MAAM,WAAW,mBAAmB;IAClC,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,kBAAkB,EAAE,QAAQ,EAAE,CAAC,OAAO,EAAE,iBAAiB,KAAK,IAAI,GAAG,IAAI,CAAC;CAC3F;AAED,qBAAa,mBAAoB,SAAQ,YAAY;IAYjD,OAAO,CAAC,QAAQ,CAAC,cAAc;IAE/B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC;IAb9B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAY;IACtC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAgC;IACxD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAiC;IAC1D,OAAO,CAAC,QAAQ,CAAC,MAAM,CAGpB;IACH,gBAAuB,KAAK,eAAS;gBAGnC,SAAS,EAAE,SAAS,EACH,cAAc,EAAE,cAAc,EAC/C,WAAW,EAAE,UAAU,EACN,UAAU,CAAC,wBAAY;YAQ5B,mBAAmB;IAKjC,0DAA0D;IAC7C,4BAA4B,IAAI,OAAO,CAAC,MAAM,CAAC;IAO/C,UAAU,IAAI,OAAO,CAAC,OAAO,CAAC;IAKpC,wBAAwB,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;IAI7C,gBAAgB,CAAC,SAAS,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;YAsB/C,qBAAqB;IAItB,yBAAyB,CACpC,mBAAmB,EAAE,mBAAmB,EACxC,qBAAqB,EAAE,CAAC,cAAc,EAAE,MAAM,KAAK,IAAI,EACvD,YAAY,EAAE,YAAY,GACzB,OAAO,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAC,CAAC;IAoC3D;;;;;;;OAOG;IACH,OAAO,CAAC,eAAe;IAYT,kBAAkB,CAC9B,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,kBAAkB,EAC1B,MAAM,GAAE,OAAe,GACtB,cAAc,CAAC,mBAAmB,CAAC;IAmCtC;;;;;;OAMG;YACW,WAAW;CAmC1B"}

package/lib/notification/NotificationService.js

@@ -47,10 +47,10 @@ var TOPIC;
     TOPIC["NOTIFICATION_ERROR"] = "NotificationService.TOPIC.NOTIFICATION_ERROR";
 })(TOPIC || (TOPIC = {}));
 class NotificationService extends events_1.EventEmitter {
-    constructor(apiClient, mlsService, proteusService, storeEngine) {
+    constructor(apiClient, proteusService, storeEngine, mlsService) {
         super();
-        this.mlsService = mlsService;
         this.proteusService = proteusService;
+        this.mlsService = mlsService;
         this.logger = (0, logdown_1.default)('@wireapp/core/NotificationService', {
             logger: console,
             markdown: false,
@@ -192,9 +192,9 @@ class NotificationService extends events_1.EventEmitter {
      * @return the decrypted payload and the raw event. Returns `undefined` when the payload is a coreCrypto-only system message
      */
     async handleEvent(event, source, dryRun = false) {
-        var _a;
+        var _a, _b;
         // Handle MLS Events
-        const mlsResult = await this.mlsService.handleEvent({ event, source, dryRun });
+        const mlsResult = await ((_a = this.mlsService) === null || _a === void 0 ? void 0 : _a.handleEvent({ event, source, dryRun }));
         if (mlsResult) {
             return mlsResult;
         }
@@ -212,7 +212,7 @@ class NotificationService extends events_1.EventEmitter {
             case event_1.CONVERSATION_EVENT.MEMBER_JOIN:
                 // As of today (07/07/2022) the backend sends `WELCOME` message to the user's own conversation (not the actual conversation that the welcome should be part of)
                 // So in order to map conversation Ids and groupId together, we need to first fetch the conversation and get the groupId linked to it.
-                const conversation = await this.apiClient.api.conversation.getConversation((_a = event.qualified_conversation) !== null && _a !== void 0 ? _a : { id: event.conversation, domain: '' });
+                const conversation = await this.apiClient.api.conversation.getConversation((_b = event.qualified_conversation) !== null && _b !== void 0 ? _b : { id: event.conversation, domain: '' });
                 if (!conversation) {
                     throw new Error('no conv');
                 }

package/lib/notification/NotificationService.test.js

@@ -35,7 +35,7 @@ describe('NotificationService', () => {
             const storeEngine = new store_engine_1.MemoryEngine();
             await storeEngine.init('NotificationService.test');
             const apiClient = new api_client_1.APIClient({ urls: MOCK_BACKEND });
-            const notificationService = new _1.NotificationService(apiClient, mockedMLSService, mockedProteusService, storeEngine);
+            const notificationService = new _1.NotificationService(apiClient, mockedProteusService, storeEngine, mockedMLSService);
             jest.spyOn(notificationService, 'handleEvent').mockImplementation(() => {
                 throw new Error('Test error');
             });
@@ -58,7 +58,7 @@ describe('NotificationService', () => {
             const storeEngine = new store_engine_1.MemoryEngine();
             await storeEngine.init('NotificationService.test');
             const apiClient = new api_client_1.APIClient({ urls: MOCK_BACKEND });
-            const notificationService = new _1.NotificationService(apiClient, mockedMLSService, mockedProteusService, storeEngine);
+            const notificationService = new _1.NotificationService(apiClient, mockedProteusService, storeEngine, mockedMLSService);
             jest.spyOn(notificationService, 'handleEvent').mockReturnValue({});
             const spySetLastNotificationId = jest
                 .spyOn(notificationService, 'setLastNotificationId')
@@ -76,7 +76,7 @@ describe('NotificationService', () => {
             const storeEngine = new store_engine_1.MemoryEngine();
             await storeEngine.init('NotificationService.test');
             const apiClient = new api_client_1.APIClient({ urls: MOCK_BACKEND });
-            const notificationService = new _1.NotificationService(apiClient, mockedMLSService, mockedProteusService, storeEngine);
+            const notificationService = new _1.NotificationService(apiClient, mockedProteusService, storeEngine, mockedMLSService);
             jest.spyOn(notificationService, 'handleEvent').mockReturnValue({});
             const spySetLastNotificationId = jest
                 .spyOn(notificationService, 'setLastNotificationId')
@@ -94,7 +94,7 @@ describe('NotificationService', () => {
                 const storeEngine = new store_engine_1.MemoryEngine();
                 await storeEngine.init('NotificationService.test');
                 const apiClient = new api_client_1.APIClient({ urls: MOCK_BACKEND });
-                const notificationService = new _1.NotificationService(apiClient, mockedMLSService, mockedProteusService, storeEngine);
+                const notificationService = new _1.NotificationService(apiClient, mockedProteusService, storeEngine, mockedMLSService);
                 notificationService.on(_1.NotificationService.TOPIC.NOTIFICATION_ERROR, notificationError => {
                     expect(notificationError.error.message).toBe('Test error');
                     expect(spySetLastNotificationId).toHaveBeenCalledTimes(0);

package/lib/util/encryptedStore.js

@@ -56,7 +56,7 @@ class EncryptedStore {
     }
     async wipe() {
         this.db.close();
-        (0, idb_1.deleteDB)(this.db.name);
+        await (0, idb_1.deleteDB)(this.db.name);
     }
 }
 exports.EncryptedStore = EncryptedStore;

package/package.json

@@ -14,6 +14,7 @@
     "@wireapp/api-client": "^22.14.1",
     "@wireapp/commons": "^5.0.4",
     "@wireapp/core-crypto": "0.6.0-rc.3",
+    "@wireapp/cryptobox": "12.8.0",
     "@wireapp/promise-queue": "^2.1.1",
     "@wireapp/protocol-messaging": "1.43.0",
     "@wireapp/store-engine": "5.0.3",
@@ -59,6 +60,6 @@
     "test:coverage": "jest --coverage",
     "watch": "tsc --watch"
   },
-  "version": "38.3.3",
-  "gitHead": "7a635f647d5a7339bddcd75d31df1b3446e9f4c0"
+  "version": "38.4.0",
+  "gitHead": "0617f4045c95b97482af997a13dd43d97ead0e21"
 }

package/lib/messagingProtocols/proteus/ProteusService/PrekeysGenerator/PrekeysGenerator.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"PrekeysGenerator.d.ts","sourceRoot":"","sources":["../../../../../src/messagingProtocols/proteus/ProteusService/PrekeysGenerator/PrekeysGenerator.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,MAAM,EAAC,MAAM,8BAA8B,CAAC;AACpD,OAAO,EAAC,UAAU,EAAC,MAAM,+CAA+C,CAAC;AAKzE,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,4BAA4B,CAAC;AAC7D,OAAO,EAAC,gBAAgB,EAAC,MAAM,yBAAyB,CAAC;AAEzD,KAAK,yBAAyB,GAAG,IAAI,CAAC,UAAU,EAAE,kBAAkB,CAAC,CAAC;AAEtE,UAAU,sBAAsB;IAC9B;;;OAGG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,YAAY,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;CAC3C;AACD,eAAO,MAAM,cAAc,QAAQ,CAAC;AAEpC,qBAAa,eAAe;IAIxB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAE1B,OAAO,CAAC,MAAM;IALhB,OAAO,CAAC,WAAW,CAAwB;gBAGxB,SAAS,EAAE,yBAAyB,EACrD,EAAE,EAAE,YAAY,EACR,MAAM,EAAE,sBAAsB;YAK1B,cAAc;YAKd,eAAe;IASvB,aAAa;IAUnB,OAAO,CAAC,sBAAsB;IAM9B;;;;OAIG;IACG,sBAAsB,IAAI,OAAO,CAAC,gBAAgB,CAAC;CAM1D"}

package/lib/messagingProtocols/proteus/ProteusService/PrekeysGenerator/PrekeysGenerator.store.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"PrekeysGenerator.store.d.ts","sourceRoot":"","sources":["../../../../../src/messagingProtocols/proteus/ProteusService/PrekeysGenerator/PrekeysGenerator.store.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,YAAY,EAAC,MAAM,4BAA4B,CAAC;AAQxD,qBAAa,qBAAqB;IACpB,OAAO,CAAC,QAAQ,CAAC,EAAE;gBAAF,EAAE,EAAE,YAAY;YAE/B,QAAQ;YAIR,SAAS;IAIvB;;;OAGG;IACG,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC;IAOhC,kBAAkB,IAAI,OAAO,CAAC,MAAM,CAAC;IAK3C;;;OAGG;IACG,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;CAMlD"}

package/lib/messagingProtocols/proteus/ProteusService/PrekeysGenerator/PrekeysGenerator.test.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=PrekeysGenerator.test.d.ts.map

package/lib/messagingProtocols/proteus/ProteusService/PrekeysGenerator/PrekeysGenerator.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"PrekeysGenerator.test.d.ts","sourceRoot":"","sources":["../../../../../src/messagingProtocols/proteus/ProteusService/PrekeysGenerator/PrekeysGenerator.test.ts"],"names":[],"mappings":""}

package/lib/messagingProtocols/proteus/ProteusService/PrekeysGenerator/index.d.ts

@@ -1,2 +0,0 @@
-export * from './PrekeysGenerator';
-//# sourceMappingURL=index.d.ts.map

package/lib/messagingProtocols/proteus/ProteusService/PrekeysGenerator/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/messagingProtocols/proteus/ProteusService/PrekeysGenerator/index.ts"],"names":[],"mappings":"AAmBA,cAAc,oBAAoB,CAAC"}