@wireapp/core 38.0.0-beta.4 → 38.0.0-beta.6

package/lib/Account.d.ts

@@ -61,8 +61,6 @@ interface AccountOptions<T> {
 type InitOptions = {
     /** cookie used to identify the current user. Will use the browser cookie if not defined */
     cookie?: Cookie;
-    /** fully initiate the client and register periodic checks */
-    initClient?: boolean;
 };
 export declare class Account<T = any> extends EventEmitter {
     private readonly apiClient;
@@ -119,35 +117,28 @@ export declare class Account<T = any> extends EventEmitter {
      */
     register(registration: RegisterData, clientType: ClientType): Promise<Context>;
     /**
-     * Will init the core with an already existing client (both on backend and local)
-     * Will fail if local client cannot be found
+     * Will init the core with an already logged in user
      *
      * @param clientType The type of client the user is using (temporary or permanent)
      */
-    init(clientType: ClientType, { cookie, initClient }?: InitOptions): Promise<Context>;
+    init(clientType: ClientType, { cookie }?: InitOptions): Promise<Context>;
     /**
      * Will log the user in with the given credential.
-     * Will also create the local client and store it in DB
      *
      * @param loginData The credentials of the user
-     * @param initClient Should the call also create the local client
      * @param clientInfo Info about the client to create (name, type...)
      */
-    login(loginData: LoginData, initClient?: boolean, clientInfo?: ClientInfo): Promise<Context>;
+    login(loginData: LoginData): Promise<Context>;
     /**
-     * Will try to get the load the local client from local DB.
-     * If clientInfo are provided, will also create the client on backend and DB
-     * If clientInfo are not provided, the method will fail if local client cannot be found
+     * Will register a new client for the current user
+     */
+    registerClient(loginData: LoginData, clientInfo?: ClientInfo, entropyData?: Uint8Array): Promise<RegisteredClient>;
+    /**
+     * Will initiate all the cryptographic material of the device and setup all the background tasks.
      *
-     * @param loginData User's credentials
-     * @param clientInfo Will allow creating the client if the local client cannot be found (else will fail if local client is not found)
-     * @param entropyData Additional entropy data
-     * @returns The local existing client or newly created client
+     * @returns The local existing client or undefined if the client does not exist or is not valid (non existing on backend)
      */
-    initClient(loginData: LoginData, clientInfo?: ClientInfo, entropyData?: Uint8Array): Promise<{
-        isNewClient: boolean;
-        localClient: RegisteredClient;
-    }>;
+    initClient(client?: RegisteredClient): Promise<RegisteredClient | undefined>;
     private initCoreCrypto;
     /**
      * In order to be able to send MLS messages, the core needs a few information from the consumer.
@@ -158,8 +149,6 @@ export declare class Account<T = any> extends EventEmitter {
      */
     configureMLSCallbacks(mlsCallbacks: MLSCallbacks): void;
     initServices(context: Context): Promise<void>;
-    loadAndValidateLocalClient(): Promise<RegisteredClient>;
-    private registerClient;
     private resetContext;
     /**
      * Will logout the current user
@@ -205,7 +194,6 @@ export declare class Account<T = any> extends EventEmitter {
          */
         dryRun?: boolean;
     }): () => void;
-    runCryptoboxMigration(): Promise<void>;
     private generateDbName;
     private generateSecretsDbName;
     private generateCoreDbName;

package/lib/Account.d.ts.map

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

package/lib/Account.js

@@ -34,9 +34,7 @@ const client_1 = require("@wireapp/api-client/lib/client/");
 const event_1 = require("@wireapp/api-client/lib/event");
 const tcp_1 = require("@wireapp/api-client/lib/tcp/");
 const ReconnectingWebsocket_1 = require("@wireapp/api-client/lib/tcp/ReconnectingWebsocket");
-const axios_1 = __importDefault(require("axios"));
 const bazinga64_1 = require("bazinga64");
-const http_status_codes_1 = require("http-status-codes");
 const logdown_1 = __importDefault(require("logdown"));
 const events_1 = require("events");
 const api_client_1 = require("@wireapp/api-client");
@@ -50,7 +48,6 @@ const connection_1 = require("./connection/");
 const conversation_1 = require("./conversation/");
 const messageSender_1 = require("./conversation/message/messageSender");
 const giphy_1 = require("./giphy/");
-const identityClearer_1 = require("./identity/identityClearer");
 const linkPreview_1 = require("./linkPreview");
 const mls_1 = require("./messagingProtocols/mls");
 const proteus_1 = require("./messagingProtocols/proteus");
@@ -145,103 +142,83 @@ class Account extends events_1.EventEmitter {
         return context;
     }
     /**
-     * Will init the core with an already existing client (both on backend and local)
-     * Will fail if local client cannot be found
+     * Will init the core with an already logged in user
      *
      * @param clientType The type of client the user is using (temporary or permanent)
      */
-    async init(clientType, { cookie, initClient = true } = {}) {
+    async init(clientType, { cookie } = {}) {
         const context = await this.apiClient.init(clientType, cookie);
         await this.initServices(context);
-        // Assumption: client gets only initialized once
-        if (initClient) {
-            await this.initClient({ clientType });
-        }
         return context;
     }
     /**
      * Will log the user in with the given credential.
-     * Will also create the local client and store it in DB
      *
      * @param loginData The credentials of the user
-     * @param initClient Should the call also create the local client
      * @param clientInfo Info about the client to create (name, type...)
      */
-    async login(loginData, initClient = true, clientInfo = coreDefaultClient) {
+    async login(loginData) {
         this.resetContext();
         auth_2.LoginSanitizer.removeNonPrintableCharacters(loginData);
         const context = await this.apiClient.login(loginData);
         await this.initServices(context);
-        if (initClient) {
-            await this.initClient(loginData, clientInfo);
-        }
         return context;
     }
     /**
-     * Will try to get the load the local client from local DB.
-     * If clientInfo are provided, will also create the client on backend and DB
-     * If clientInfo are not provided, the method will fail if local client cannot be found
+     * Will register a new client for the current user
+     */
+    async registerClient(loginData, clientInfo = coreDefaultClient, entropyData) {
+        var _a;
+        if (!this.service || !this.apiClient.context || !this.coreCryptoClient || !this.storeEngine) {
+            throw new Error('Services are not set or context not initialized.');
+        }
+        const shouldCreateMlsClient = !!((_a = this.cryptoProtocolConfig) === null || _a === void 0 ? void 0 : _a.mls);
+        this.logger.info(`Creating new client {mls: ${shouldCreateMlsClient}}`);
+        if (entropyData) {
+            await this.coreCryptoClient.reseedRng(entropyData);
+        }
+        await this.service.proteus.initClient(this.storeEngine, this.apiClient.context);
+        const initialPreKeys = await this.service.proteus.createClient();
+        const client = await this.service.client.register(loginData, clientInfo, initialPreKeys);
+        if (shouldCreateMlsClient) {
+            const { userId, domain = '' } = this.apiClient.context;
+            await this.service.mls.createClient({ id: userId, domain }, client.id);
+        }
+        this.logger.info('Client is created');
+        await this.service.notification.initializeNotificationStream();
+        await this.service.client.synchronizeClients();
+        await this.initClient(client);
+        return client;
+    }
+    /**
+     * Will initiate all the cryptographic material of the device and setup all the background tasks.
      *
-     * @param loginData User's credentials
-     * @param clientInfo Will allow creating the client if the local client cannot be found (else will fail if local client is not found)
-     * @param entropyData Additional entropy data
-     * @returns The local existing client or newly created client
+     * @returns The local existing client or undefined if the client does not exist or is not valid (non existing on backend)
      */
-    async initClient(loginData, clientInfo, entropyData) {
-        var _a, _b, _c;
-        if (!this.service || !this.apiClient.context || !this.coreCryptoClient) {
+    async initClient(client) {
+        var _a;
+        if (!this.service || !this.apiClient.context || !this.coreCryptoClient || !this.storeEngine) {
             throw new Error('Services are not set.');
         }
-        try {
-            const localClient = await this.loadAndValidateLocalClient();
-            //call /access endpoint with client_id after client initialisation
-            await this.apiClient.transport.http.associateClientWithSession(localClient.id);
-            await this.service.proteus.init();
-            if (this.backendFeatures.supportsMLS && ((_a = this.cryptoProtocolConfig) === null || _a === void 0 ? void 0 : _a.mls)) {
-                const { userId, domain = '' } = this.apiClient.context;
-                await this.service.mls.initClient({ id: userId, domain }, localClient.id);
-                // 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();
-            }
-            return { isNewClient: false, localClient };
+        const validClient = client !== null && client !== void 0 ? client : (await this.service.client.loadClient());
+        if (!validClient) {
+            return undefined;
         }
-        catch (error) {
-            if (!clientInfo) {
-                // If no client info provided, the client should not be created
-                throw error;
-            }
-            // There was no client so we need to "create" and "register" a client
-            const notFoundInDatabase = error instanceof store_engine_1.error.RecordNotFoundError ||
-                error.constructor.name === store_engine_1.error.RecordNotFoundError.name;
-            const notFoundOnBackend = axios_1.default.isAxiosError(error) ? ((_b = error.response) === null || _b === void 0 ? void 0 : _b.status) === http_status_codes_1.StatusCodes.NOT_FOUND : false;
-            if (notFoundInDatabase) {
-                this.logger.log(`Could not find valid client in database "${(_c = this.storeEngine) === null || _c === void 0 ? void 0 : _c.storeName}".`);
-                return this.registerClient(loginData, clientInfo, entropyData);
-            }
-            if (notFoundOnBackend) {
-                this.logger.log('Could not find valid client on backend');
-                const client = await this.service.client.getLocalClient();
-                const shouldDeleteWholeDatabase = client.type === client_1.ClientType.TEMPORARY;
-                if (shouldDeleteWholeDatabase) {
-                    this.logger.log('Last client was temporary - Deleting database');
-                    if (this.storeEngine) {
-                        await this.storeEngine.clearTables();
-                    }
-                    const context = await this.apiClient.init(loginData.clientType);
-                    await this.initEngine(context);
-                }
-                else if (this.storeEngine) {
-                    this.logger.log('Last client was permanent - Deleting previous identity');
-                    (0, identityClearer_1.deleteIdentity)(this.storeEngine);
-                }
-                return this.registerClient(loginData, clientInfo, entropyData);
-            }
-            throw error;
+        this.apiClient.context.clientId = validClient.id;
+        // Call /access endpoint with client_id after client initialisation
+        await this.apiClient.transport.http.associateClientWithSession(validClient.id);
+        await this.service.proteus.initClient(this.storeEngine, this.apiClient.context);
+        if (this.backendFeatures.supportsMLS && ((_a = this.cryptoProtocolConfig) === null || _a === void 0 ? void 0 : _a.mls)) {
+            const { userId, domain = '' } = this.apiClient.context;
+            await this.service.mls.initClient({ id: userId, domain }, validClient.id);
+            // 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();
         }
+        return validClient;
     }
     async initCoreCrypto(context) {
         var _a, _b;
@@ -319,35 +296,6 @@ class Account extends events_1.EventEmitter {
             user: userService,
         };
     }
-    async loadAndValidateLocalClient() {
-        const loadedClient = await this.service.client.getLocalClient();
-        await this.apiClient.api.client.getClient(loadedClient.id);
-        this.apiClient.context.clientId = loadedClient.id;
-        return loadedClient;
-    }
-    async registerClient(loginData, clientInfo = coreDefaultClient, entropyData) {
-        var _a;
-        if (!this.service || !this.apiClient.context || !this.coreCryptoClient) {
-            throw new Error('Services are not set or context not initialized.');
-        }
-        const createMlsClient = !!((_a = this.cryptoProtocolConfig) === null || _a === void 0 ? void 0 : _a.mls);
-        this.logger.info(`Creating new client {mls: ${createMlsClient}}`);
-        if (entropyData) {
-            await this.coreCryptoClient.reseedRng(entropyData);
-        }
-        await this.service.proteus.init();
-        const initialPreKeys = await this.service.proteus.createClient();
-        const registeredClient = await this.service.client.register(loginData, clientInfo, initialPreKeys);
-        if (createMlsClient) {
-            const { userId, domain = '' } = this.apiClient.context;
-            await this.service.mls.createClient({ id: userId, domain }, registeredClient.id);
-        }
-        this.apiClient.context.clientId = registeredClient.id;
-        this.logger.info('Client is created');
-        await this.service.notification.initializeNotificationStream();
-        await this.service.client.synchronizeClients();
-        return { isNewClient: true, localClient: registeredClient };
-    }
     resetContext() {
         delete this.apiClient.context;
         delete this.service;
@@ -476,31 +424,6 @@ class Account extends events_1.EventEmitter {
             this.apiClient.transport.ws.removeAllListeners();
         };
     }
-    async runCryptoboxMigration() {
-        var _a;
-        const dbName = (_a = this.storeEngine) === null || _a === void 0 ? void 0 : _a.storeName;
-        if (!dbName) {
-            this.logger.error('Client was not able to perform DB migration: database was not initialised yet');
-            return;
-        }
-        try {
-            this.logger.log(`Migrating data from cryptobox store (${dbName}) to corecrypto.`);
-            await this.service.proteus.proteusCryptoboxMigrate(dbName);
-            // We can clear 3 stores (keys - local identity, prekeys and sessions) from wire db.
-            // They will be stored in corecrypto database now.
-            /* TODO uncomment this code when we are sure migration for wire.com has happened successfully for enough users
-            const storesToClear = ['keys', 'prekeys', 'sessions'] as const;
-      
-            for (const storeName of storesToClear) {
-              await this.storeEngine?.deleteAll(storeName);
-            }
-            */
-            this.logger.log(`Successfully migrated from cryptobox store (${dbName}) to corecrypto.`);
-        }
-        catch (error) {
-            this.logger.error('Client was not able to perform DB migration: ', error);
-        }
-    }
     generateDbName(context) {
         const clientType = context.clientType === client_1.ClientType.NONE ? '' : `@${context.clientType}`;
         return `wire@${this.apiClient.config.urls.name}@${context.userId}${clientType}`;

package/lib/Account.test.js

@@ -179,12 +179,11 @@ describe('Account', () => {
             const apiClient = new api_client_1.APIClient({ urls: MOCK_BACKEND });
             const account = new Account_1.Account(apiClient);
             await account.initServices({ clientType: client_1.ClientType.TEMPORARY, userId: '' });
-            const { clientId, clientType, userId } = await account.login({
+            const { clientType, userId } = await account.login({
                 clientType: client_1.ClientType.TEMPORARY,
                 email: 'hello@example.com',
                 password: 'my-secret',
             });
-            expect(clientId).toBe(CLIENT_ID);
             expect(commons_1.ValidationUtil.isUUIDv4(userId)).toBe(true);
             expect(clientType).toBe(client_1.ClientType.TEMPORARY);
         });
@@ -271,6 +270,9 @@ describe('Account', () => {
             jest
                 .spyOn(dependencies.account.service.notification, 'handleNotification')
                 .mockImplementation(notif => notif.payload);
+            jest
+                .spyOn(dependencies.account.service.notification['database'], 'getLastNotificationId')
+                .mockResolvedValue('0');
         });
         afterEach(() => {
             server.close();

package/lib/client/ClientService.d.ts

@@ -18,6 +18,7 @@ export declare class ClientService {
     private readonly storeEngine;
     private readonly database;
     private readonly backend;
+    private readonly logger;
     constructor(apiClient: APIClient, proteusService: ProteusService, storeEngine: CRUDEngine);
     getClients(): Promise<RegisteredClient[]>;
     /**
@@ -34,7 +35,15 @@ export declare class ClientService {
      * @param password? Password of the owning user. Can be omitted for temporary devices
      */
     deleteLocalClient(password?: string): Promise<string>;
-    getLocalClient(): Promise<MetaClient>;
+    private getLocalClient;
+    /**
+     * Will try to load the local client from the database into memory.
+     * Will return undefined if the client is not found in the database or if the client does not exist on the backend.
+     * If the client doesn't exist on backend it will purge the database and return undefined.
+     *
+     * @return the loaded client or undefined
+     */
+    loadClient(): Promise<RegisteredClient | undefined>;
     private createLocalClient;
     synchronizeClients(): Promise<MetaClient[]>;
     register(loginData: LoginData, clientInfo: ClientInfo, { prekeys, lastPrekey }: NewDevicePrekeys): Promise<RegisteredClient>;

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;AAGlG,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,gBAAgB,EAAC,MAAM,8CAA8C,CAAC;AAE9E,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;IAKtB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAN9B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA2B;IACpD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA0B;gBAG/B,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;IAS3D,cAAc,IAAI,OAAO,CAAC,UAAU,CAAC;IAI5C,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,gBAAgB,GACtC,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;AAGjD,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAC,gBAAgB,EAAC,MAAM,8CAA8C,CAAC;AAE9E,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,gBAAgB,GACtC,OAAO,CAAC,gBAAgB,CAAC;CA4B7B"}

package/lib/client/ClientService.js

@@ -17,15 +17,26 @@
  * along with this program. If not, see http://www.gnu.org/licenses/.
  *
  */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ClientService = void 0;
 const client_1 = require("@wireapp/api-client/lib/client/");
+const axios_1 = __importDefault(require("axios"));
+const http_status_codes_1 = require("http-status-codes");
+const logdown_1 = __importDefault(require("logdown"));
+const identityClearer_1 = require("../identity/identityClearer");
 const _1 = require("./");
 class ClientService {
     constructor(apiClient, proteusService, storeEngine) {
         this.apiClient = apiClient;
         this.proteusService = proteusService;
         this.storeEngine = storeEngine;
+        this.logger = (0, logdown_1.default)('@wireapp/core/Client', {
+            logger: console,
+            markdown: false,
+        });
         this.database = new _1.ClientDatabaseRepository(this.storeEngine, this.apiClient.backendFeatures.federationEndpoints);
         this.backend = new _1.ClientBackendRepository(this.apiClient);
     }
@@ -58,8 +69,47 @@ class ClientService {
         await this.backend.deleteClient(localClientId, password);
         return this.database.deleteLocalClient();
     }
-    getLocalClient() {
-        return this.database.getLocalClient();
+    async getLocalClient() {
+        try {
+            return await this.database.getLocalClient();
+        }
+        catch (error) {
+            return undefined;
+        }
+    }
+    /**
+     * Will try to load the local client from the database into memory.
+     * Will return undefined if the client is not found in the database or if the client does not exist on the backend.
+     * If the client doesn't exist on backend it will purge the database and return undefined.
+     *
+     * @return the loaded client or undefined
+     */
+    async loadClient() {
+        var _a;
+        const loadedClient = await this.getLocalClient();
+        if (!loadedClient) {
+            return undefined;
+        }
+        try {
+            await this.apiClient.api.client.getClient(loadedClient.id);
+            return loadedClient;
+        }
+        catch (error) {
+            const notFoundOnBackend = axios_1.default.isAxiosError(error) ? ((_a = error.response) === null || _a === void 0 ? void 0 : _a.status) === http_status_codes_1.StatusCodes.NOT_FOUND : false;
+            if (notFoundOnBackend && this.storeEngine) {
+                this.logger.log('Could not find valid client on backend');
+                const shouldDeleteWholeDatabase = loadedClient.type === client_1.ClientType.TEMPORARY;
+                if (shouldDeleteWholeDatabase) {
+                    this.logger.log('Last client was temporary - Deleting database');
+                    await this.storeEngine.clearTables();
+                }
+                else {
+                    this.logger.log('Last client was permanent - Deleting previous identity');
+                    (0, identityClearer_1.deleteIdentity)(this.storeEngine);
+                }
+            }
+        }
+        return undefined;
     }
     createLocalClient(client, domain) {
         return this.database.createLocalClient(client, domain);

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

@@ -1,9 +1,15 @@
 import { QualifiedId } from '@wireapp/api-client/lib/user';
-import logdown from 'logdown';
 import { DecryptionError } from '../../../../errors/DecryptionError';
-declare const generateDecryptionError: (senderInfo: {
+export declare const ProteusErrors: {
+    readonly InvalidMessage: 201;
+    readonly RemoteIdentityChanged: 204;
+    readonly InvalidSignature: 207;
+    readonly Unknown: 999;
+};
+type SenderInfo = {
     clientId: string;
     userId: QualifiedId;
-}, error: any, logger: logdown.Logger) => DecryptionError;
-export { generateDecryptionError };
+};
+export declare const generateDecryptionError: (senderInfo: SenderInfo, error: any) => DecryptionError;
+export {};
 //# sourceMappingURL=DecryptionErrorGenerator.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"DecryptionErrorGenerator.d.ts","sourceRoot":"","sources":["../../../../../src/messagingProtocols/proteus/ProteusService/DecryptionErrorGenerator/DecryptionErrorGenerator.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AACzD,OAAO,OAAO,MAAM,SAAS,CAAC;AAE9B,OAAO,EAAC,eAAe,EAAC,MAAM,oCAAoC,CAAC;AAKnE,QAAA,MAAM,uBAAuB,eACf;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,WAAW,CAAA;CAAC,SAC5C,GAAG,UACF,QAAQ,MAAM,KACrB,eA6BF,CAAC;AAEF,OAAO,EAAC,uBAAuB,EAAC,CAAC"}
+{"version":3,"file":"DecryptionErrorGenerator.d.ts","sourceRoot":"","sources":["../../../../../src/messagingProtocols/proteus/ProteusService/DecryptionErrorGenerator/DecryptionErrorGenerator.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AAEzD,OAAO,EAAC,eAAe,EAAC,MAAM,oCAAoC,CAAC;AAEnE,eAAO,MAAM,aAAa;;;;;CAKhB,CAAC;AAoCX,KAAK,UAAU,GAAG;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,WAAW,CAAA;CAAC,CAAC;AAC1D,eAAO,MAAM,uBAAuB,eAAgB,UAAU,SAAS,GAAG,KAAG,eAO5E,CAAC"}

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

@@ -18,32 +18,43 @@
  *
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateDecryptionError = void 0;
+exports.generateDecryptionError = exports.ProteusErrors = void 0;
 const DecryptionError_1 = require("../../../../errors/DecryptionError");
-const hasErrorCode = (error) => error && error.code;
-const generateDecryptionError = (senderInfo, error, logger) => {
+exports.ProteusErrors = {
+    InvalidMessage: 201,
+    RemoteIdentityChanged: 204,
+    InvalidSignature: 207,
+    Unknown: 999,
+};
+const CoreCryptoErrorMapping = {
+    InvalidMessage: exports.ProteusErrors.InvalidMessage,
+    RemoteIdentityChanged: exports.ProteusErrors.RemoteIdentityChanged,
+    InvalidSignature: exports.ProteusErrors.InvalidSignature,
+    Unknown: exports.ProteusErrors.Unknown,
+};
+const mapCoreCryptoError = (error) => {
     var _a;
-    const errorCode = hasErrorCode(error) ? (_a = error.code) !== null && _a !== void 0 ? _a : 999 : 999;
-    let message = 'Unknown decryption error';
-    const { clientId: remoteClientId, userId } = senderInfo;
-    const { id: remoteUserId } = userId;
-    const isDuplicateMessage = false; // TODO when coreCrypto returns ganular errors
-    const isOutdatedMessage = false; // TODO when coreCrypto returns ganular errors
-    // We don't need to show these message errors to the user
-    if (isDuplicateMessage || isOutdatedMessage) {
-        message = `Message from user ID "${remoteUserId}" will not be handled because it is outdated or a duplicate.`;
-    }
-    const isInvalidMessage = false; // TODO when coreCrypto returns ganular errors
-    const isInvalidSignature = false; // TODO when coreCrypto returns ganular errors
-    const isRemoteIdentityChanged = false; // TODO when coreCrypto returns ganular errors
-    // Session is broken, let's see what's really causing it...
-    if (isInvalidMessage || isInvalidSignature) {
-        message = `Session with user '${remoteUserId}' (${remoteClientId}) is broken.\nReset the session for possible fix.`;
-    }
-    else if (isRemoteIdentityChanged) {
-        message = `Remote identity of client '${remoteClientId}' from user '${remoteUserId}' changed`;
+    return (_a = CoreCryptoErrorMapping[error.message]) !== null && _a !== void 0 ? _a : exports.ProteusErrors.Unknown;
+};
+const getErrorMessage = (code, userId, clientId) => {
+    const sender = `${userId.id} (${clientId})`;
+    switch (code) {
+        case exports.ProteusErrors.InvalidMessage:
+            return `Invalid message from ${sender}`;
+        case exports.ProteusErrors.InvalidSignature:
+            return `Invalid signature from ${sender}`;
+        case exports.ProteusErrors.RemoteIdentityChanged:
+            return `Remote identity of ${sender} has changed`;
+        case exports.ProteusErrors.Unknown:
+            return `Unknown decryption error from ${sender}`;
+        default:
+            return `Unhandled error code "${code}" from ${sender}`;
     }
-    logger.warn(`Failed to decrypt event from client '${remoteClientId}' of user '${remoteUserId}'.\nError Code: '${errorCode}'\nError Message: ${error.message}`, error);
-    return new DecryptionError_1.DecryptionError(message, errorCode);
+};
+const generateDecryptionError = (senderInfo, error) => {
+    const { clientId: remoteClientId, userId } = senderInfo;
+    const code = mapCoreCryptoError(error);
+    const message = getErrorMessage(code, userId, remoteClientId);
+    return new DecryptionError_1.DecryptionError(message, code);
 };
 exports.generateDecryptionError = generateDecryptionError;

package/lib/messagingProtocols/proteus/ProteusService/DecryptionErrorGenerator/DecryptionErrorGenerator.test.js

@@ -20,14 +20,30 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const DecryptionErrorGenerator_1 = require("./DecryptionErrorGenerator");
 const DecryptionError_1 = require("../../../../errors/DecryptionError");
-const logger = {
-    warn: jest.fn(),
-};
 const basePayload = { userId: { id: 'user1', domain: 'domain' }, clientId: 'client1' };
 describe('generateDecryptionError', () => {
     it('returns a ProteusError.DecryptError', () => {
-        const error = (0, DecryptionErrorGenerator_1.generateDecryptionError)(basePayload, new Error(), logger);
+        const error = (0, DecryptionErrorGenerator_1.generateDecryptionError)(basePayload, new Error());
         expect(error).toBeInstanceOf(DecryptionError_1.DecryptionError);
-        expect(error.message).toBe('Unknown decryption error');
+        expect(error.message).toBe('Unknown decryption error from user1 (client1)');
+        expect(error.code).toBe(DecryptionErrorGenerator_1.ProteusErrors.Unknown);
+    });
+    it('handles remote identity changed', () => {
+        const error = (0, DecryptionErrorGenerator_1.generateDecryptionError)(basePayload, new Error('RemoteIdentityChanged'));
+        expect(error).toBeInstanceOf(DecryptionError_1.DecryptionError);
+        expect(error.message).toBe('Remote identity of user1 (client1) has changed');
+        expect(error.code).toBe(DecryptionErrorGenerator_1.ProteusErrors.RemoteIdentityChanged);
+    });
+    it('handles invalid message', () => {
+        const error = (0, DecryptionErrorGenerator_1.generateDecryptionError)(basePayload, new Error('InvalidMessage'));
+        expect(error).toBeInstanceOf(DecryptionError_1.DecryptionError);
+        expect(error.message).toBe('Invalid message from user1 (client1)');
+        expect(error.code).toBe(DecryptionErrorGenerator_1.ProteusErrors.InvalidMessage);
+    });
+    it('handles invalid signature', () => {
+        const error = (0, DecryptionErrorGenerator_1.generateDecryptionError)(basePayload, new Error('InvalidSignature'));
+        expect(error).toBeInstanceOf(DecryptionError_1.DecryptionError);
+        expect(error.message).toBe('Invalid signature from user1 (client1)');
+        expect(error.code).toBe(DecryptionErrorGenerator_1.ProteusErrors.InvalidSignature);
     });
 });

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

@@ -1,8 +1,9 @@
 import type { APIClient } from '@wireapp/api-client/lib/APIClient';
-import type { PreKey } from '@wireapp/api-client/lib/auth';
+import type { PreKey, Context } from '@wireapp/api-client/lib/auth';
 import type { Conversation, OTRRecipients, QualifiedOTRRecipients, QualifiedUserClients, UserClients } from '@wireapp/api-client/lib/conversation';
 import type { QualifiedId, QualifiedUserPreKeyBundleMap, UserPreKeyBundleMap } from '@wireapp/api-client/lib/user';
 import type { CoreCrypto } from '@wireapp/core-crypto';
+import { CRUDEngine } from '@wireapp/store-engine';
 import type { AddUsersToProteusConversationParams, CreateProteusConversationParams, ProteusServiceConfig, SendProteusMessageParams } from './ProteusService.types';
 import { SendResult } from '../../../conversation';
 import { CoreDatabase } from '../../../storage/CoreDB';
@@ -17,7 +18,7 @@ export declare class ProteusService {
     private readonly prekeyGenerator;
     constructor(apiClient: APIClient, coreCryptoClient: CoreCrypto, db: CoreDatabase, config: ProteusServiceConfig);
     handleEvent(params: Pick<EventHandlerParams, 'event' | 'source' | 'dryRun'>): EventHandlerResult;
-    init(): Promise<void>;
+    initClient(storeEngine: CRUDEngine, context: Context): Promise<void>;
     createClient(): Promise<import("./ProteusService.types").NewDevicePrekeys>;
     /**
      * Get the fingerprint of the local client.
@@ -39,6 +40,6 @@ export declare class ProteusService {
     encrypt(plainText: Uint8Array, recipients: UserPreKeyBundleMap | UserClients, domain?: string): Promise<OTRRecipients<Uint8Array>>;
     deleteSession(userId: QualifiedId, clientId: string): Promise<void>;
     encryptQualified(plainText: Uint8Array, preKeyBundles: QualifiedUserPreKeyBundleMap | QualifiedUserClients): Promise<QualifiedOTRRecipients>;
-    proteusCryptoboxMigrate(storeName: string): Promise<void>;
+    private migrateToCoreCrypto;
 }
 //# sourceMappingURL=ProteusService.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"ProteusService.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/proteus/ProteusService/ProteusService.ts"],"names":[],"mappings":"AAmBA,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,mCAAmC,CAAC;AACjE,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,8BAA8B,CAAC;AACzD,OAAO,KAAK,EACV,YAAY,EAEZ,aAAa,EACb,sBAAsB,EACtB,oBAAoB,EACpB,WAAW,EACZ,MAAM,sCAAsC,CAAC;AAC9C,OAAO,KAAK,EAAC,WAAW,EAAE,4BAA4B,EAAE,mBAAmB,EAAC,MAAM,8BAA8B,CAAC;AAGjH,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,sBAAsB,CAAC;AAKrD,OAAO,KAAK,EACV,mCAAmC,EACnC,+BAA+B,EAC/B,oBAAoB,EACpB,wBAAwB,EACzB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAA0C,UAAU,EAAC,MAAM,uBAAuB,CAAC;AAE1F,OAAO,EAAC,YAAY,EAAC,MAAM,yBAAyB,CAAC;AACrD,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EAAC,kBAAkB,EAAqB,MAAM,iBAAiB,CAAC;AAWvE,qBAAa,cAAc;IAMvB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IAEjC,OAAO,CAAC,QAAQ,CAAC,MAAM;IARzB,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;IAChD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA2C;IAClE,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAkB;gBAG/B,SAAS,EAAE,SAAS,EACpB,gBAAgB,EAAE,UAAU,EAC7C,EAAE,EAAE,YAAY,EACC,MAAM,EAAE,oBAAoB;IASlC,WAAW,CAAC,MAAM,EAAE,IAAI,CAAC,kBAAkB,EAAE,OAAO,GAAG,QAAQ,GAAG,QAAQ,CAAC,GAAG,kBAAkB;IAiBtG,IAAI;IAIJ,YAAY;IAInB;;OAEG;IACI,mBAAmB;IAInB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,WAAW,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM;IAIlG;;;;;;OAMG;IACU,oBAAoB,CAAC,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM;IAQ3E,kBAAkB,CAAC,EAC9B,gBAAgB,EAChB,YAAY,GACb,EAAE,+BAA+B,GAAG,OAAO,CAAC,YAAY,CAAC;IAiB7C,sBAAsB,CAAC,EAAC,cAAc,EAAE,gBAAgB,EAAC,EAAE,mCAAmC;IAI9F,WAAW,CAAC,EACvB,OAAO,EACP,cAAc,EACd,cAAc,EACd,UAAU,EACV,UAAU,EACV,OAAO,EACP,gBAAgB,GACjB,EAAE,wBAAwB,GAAG,OAAO,CAAC,UAAU,CAAC;YA2CnC,OAAO;IAwBR,OAAO,CAClB,SAAS,EAAE,UAAU,EACrB,UAAU,EAAE,mBAAmB,GAAG,WAAW,EAC7C,MAAM,GAAE,MAAW,GAClB,OAAO,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;IAc9B,aAAa,CAAC,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM;IAS7C,gBAAgB,CAC3B,SAAS,EAAE,UAAU,EACrB,aAAa,EAAE,4BAA4B,GAAG,oBAAoB,GACjE,OAAO,CAAC,sBAAsB,CAAC;IAWrB,uBAAuB,CAAC,SAAS,EAAE,MAAM;CAGvD"}
+{"version":3,"file":"ProteusService.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/proteus/ProteusService/ProteusService.ts"],"names":[],"mappings":"AAmBA,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,mCAAmC,CAAC;AACjE,OAAO,KAAK,EAAC,MAAM,EAAE,OAAO,EAAC,MAAM,8BAA8B,CAAC;AAClE,OAAO,KAAK,EACV,YAAY,EAEZ,aAAa,EACb,sBAAsB,EACtB,oBAAoB,EACpB,WAAW,EACZ,MAAM,sCAAsC,CAAC;AAC9C,OAAO,KAAK,EAAC,WAAW,EAAE,4BAA4B,EAAE,mBAAmB,EAAC,MAAM,8BAA8B,CAAC;AAGjH,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,sBAAsB,CAAC;AAErD,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAC;AAIjD,OAAO,KAAK,EACV,mCAAmC,EACnC,+BAA+B,EAC/B,oBAAoB,EACpB,wBAAwB,EACzB,MAAM,wBAAwB,CAAC;AAGhC,OAAO,EAA0C,UAAU,EAAC,MAAM,uBAAuB,CAAC;AAE1F,OAAO,EAAC,YAAY,EAAC,MAAM,yBAAyB,CAAC;AACrD,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EAAC,kBAAkB,EAAqB,MAAM,iBAAiB,CAAC;AAmBvE,qBAAa,cAAc;IAMvB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IAEjC,OAAO,CAAC,QAAQ,CAAC,MAAM;IARzB,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;IAChD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA2C;IAClE,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAkB;gBAG/B,SAAS,EAAE,SAAS,EACpB,gBAAgB,EAAE,UAAU,EAC7C,EAAE,EAAE,YAAY,EACC,MAAM,EAAE,oBAAoB;IASlC,WAAW,CAAC,MAAM,EAAE,IAAI,CAAC,kBAAkB,EAAE,OAAO,GAAG,QAAQ,GAAG,QAAQ,CAAC,GAAG,kBAAkB;IAiBhG,UAAU,CAAC,WAAW,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO;IAK1D,YAAY;IAInB;;OAEG;IACI,mBAAmB;IAInB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,WAAW,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM;IAIlG;;;;;;OAMG;IACU,oBAAoB,CAAC,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM;IAQ3E,kBAAkB,CAAC,EAC9B,gBAAgB,EAChB,YAAY,GACb,EAAE,+BAA+B,GAAG,OAAO,CAAC,YAAY,CAAC;IAiB7C,sBAAsB,CAAC,EAAC,cAAc,EAAE,gBAAgB,EAAC,EAAE,mCAAmC;IAI9F,WAAW,CAAC,EACvB,OAAO,EACP,cAAc,EACd,cAAc,EACd,UAAU,EACV,UAAU,EACV,OAAO,EACP,gBAAgB,GACjB,EAAE,wBAAwB,GAAG,OAAO,CAAC,UAAU,CAAC;YA2CnC,OAAO;IAwBR,OAAO,CAClB,SAAS,EAAE,UAAU,EACrB,UAAU,EAAE,mBAAmB,GAAG,WAAW,EAC7C,MAAM,GAAE,MAAW,GAClB,OAAO,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;IAc9B,aAAa,CAAC,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM;IAS7C,gBAAgB,CAC3B,SAAS,EAAE,UAAU,EACrB,aAAa,EAAE,4BAA4B,GAAG,oBAAoB,GACjE,OAAO,CAAC,sBAAsB,CAAC;YAWpB,mBAAmB;CA8BlC"}

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

@@ -26,12 +26,21 @@ const logdown_1 = __importDefault(require("logdown"));
 const protocol_messaging_1 = require("@wireapp/protocol-messaging");
 const DecryptionErrorGenerator_1 = require("./DecryptionErrorGenerator");
 const PrekeysGenerator_1 = require("./PrekeysGenerator");
+const sessionIdMigrator_1 = require("./sessionIdMigrator");
 const conversation_1 = require("../../../conversation");
 const MessageService_1 = require("../../../conversation/message/MessageService");
 const EventHandler_1 = require("../EventHandler");
 const getGenericMessageParams_1 = require("../Utility/getGenericMessageParams");
 const isClearFromMismatch_1 = require("../Utility/isClearFromMismatch");
 const SessionHandler_1 = require("../Utility/SessionHandler");
+function getLocalStorage() {
+    try {
+        return window.localStorage;
+    }
+    catch (_a) {
+        return { setItem: () => { }, getItem: () => { }, removeItem: () => { } };
+    }
+}
 class ProteusService {
     constructor(apiClient, coreCryptoClient, db, config) {
         this.apiClient = apiClient;
@@ -56,7 +65,8 @@ class ProteusService {
         }
         return handledEvent;
     }
-    init() {
+    async initClient(storeEngine, context) {
+        await this.migrateToCoreCrypto(storeEngine, context);
         return this.coreCryptoClient.proteusInit();
     }
     createClient() {
@@ -152,7 +162,7 @@ class ProteusService {
             return decryptedMessage;
         }
         catch (error) {
-            throw (0, DecryptionErrorGenerator_1.generateDecryptionError)({ userId, clientId }, error, this.logger);
+            throw (0, DecryptionErrorGenerator_1.generateDecryptionError)({ userId, clientId }, error);
         }
     }
     async encrypt(plainText, recipients, domain = '') {
@@ -182,8 +192,34 @@ class ProteusService {
         }
         return qualifiedOTRRecipients;
     }
-    async proteusCryptoboxMigrate(storeName) {
-        return this.coreCryptoClient.proteusCryptoboxMigrate(storeName);
+    async migrateToCoreCrypto(storeEngine, context) {
+        var _a;
+        const dbName = storeEngine.storeName;
+        const migrationFlag = `${dbName}-corecrypto-ready`;
+        const localStorage = getLocalStorage();
+        if (localStorage.getItem(migrationFlag)) {
+            return;
+        }
+        // We want sessions to be fully qualified from now on
+        (0, sessionIdMigrator_1.migrateToQualifiedSessionIds)(storeEngine, (_a = context.domain) !== null && _a !== void 0 ? _a : '');
+        this.logger.log(`Migrating data from cryptobox store (${dbName}) to corecrypto.`);
+        try {
+            await this.coreCryptoClient.proteusCryptoboxMigrate(dbName);
+            // We can clear 3 stores (keys - local identity, prekeys and sessions) from wire db.
+            // They will be stored in corecrypto database now.
+            /* TODO uncomment this code when we are sure migration for wire.com has happened successfully for enough users
+            const storesToClear = ['keys', 'prekeys', 'sessions'] as const;
+      
+            for (const storeName of storesToClear) {
+              await this.storeEngine?.deleteAll(storeName);
+            }
+            */
+            this.logger.log(`Successfully migrated from cryptobox store (${dbName}) to corecrypto.`);
+            localStorage.setItem(migrationFlag, '1');
+        }
+        catch (error) {
+            this.logger.error('Client was not able to perform DB migration: ', error);
+        }
     }
 }
 exports.ProteusService = ProteusService;

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

@@ -1,4 +1,5 @@
 export * from './ProteusService';
 export * from '../Utility';
 export * from './ProteusService.types';
+export { ProteusErrors } from './DecryptionErrorGenerator';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/proteus/ProteusService/index.ts"],"names":[],"mappings":"AAmBA,cAAc,kBAAkB,CAAC;AACjC,cAAc,YAAY,CAAC;AAC3B,cAAc,wBAAwB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/proteus/ProteusService/index.ts"],"names":[],"mappings":"AAmBA,cAAc,kBAAkB,CAAC;AACjC,cAAc,YAAY,CAAC;AAC3B,cAAc,wBAAwB,CAAC;AACvC,OAAO,EAAC,aAAa,EAAC,MAAM,4BAA4B,CAAC"}

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

@@ -32,6 +32,9 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.ProteusErrors = void 0;
 __exportStar(require("./ProteusService"), exports);
 __exportStar(require("../Utility"), exports);
 __exportStar(require("./ProteusService.types"), exports);
+var DecryptionErrorGenerator_1 = require("./DecryptionErrorGenerator");
+Object.defineProperty(exports, "ProteusErrors", { enumerable: true, get: function () { return DecryptionErrorGenerator_1.ProteusErrors; } });

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

@@ -0,0 +1,10 @@
+import { CRUDEngine } from '@wireapp/store-engine';
+/**
+ * Will migrate all the session ids in the database to fully qualified ids (from 'user-id@device-id` to  `domain@user-id@device-id`)
+ * Will only occur once for an instance of the webapp (a flag is stored in order not to re-do the migration at each loadtime)
+ *
+ * @param sessionTable The indexedDB table where the sessions are stored
+ * @param defaultDomain The domain to add to the unqualified session ids
+ */
+export declare function migrateToQualifiedSessionIds(storeEngine: CRUDEngine, defaultDomain: string): Promise<void>;
+//# sourceMappingURL=sessionIdMigrator.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"sessionIdMigrator.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/proteus/ProteusService/sessionIdMigrator.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAC;AAIjD;;;;;;GAMG;AACH,wBAAsB,4BAA4B,CAAC,WAAW,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,iBAqBhG"}

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

@@ -0,0 +1,48 @@
+"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.migrateToQualifiedSessionIds = void 0;
+const sessionTableName = 'sessions';
+/**
+ * Will migrate all the session ids in the database to fully qualified ids (from 'user-id@device-id` to  `domain@user-id@device-id`)
+ * Will only occur once for an instance of the webapp (a flag is stored in order not to re-do the migration at each loadtime)
+ *
+ * @param sessionTable The indexedDB table where the sessions are stored
+ * @param defaultDomain The domain to add to the unqualified session ids
+ */
+async function migrateToQualifiedSessionIds(storeEngine, defaultDomain) {
+    const isFullyQualified = /^[^@]+@[A-F0-9-]+@/i;
+    const updatedSessions = (await storeEngine.readAll(sessionTableName))
+        .filter(session => !isFullyQualified.test(session.id))
+        .reduce((acc, session) => {
+        return {
+            newSessions: [...acc.newSessions, Object.assign(Object.assign({}, session), { id: `${defaultDomain}@${session.id}` })],
+            oldIds: [...acc.oldIds, session.id],
+        };
+    }, { newSessions: [], oldIds: [] });
+    // In order to change primaryKeys, we need to first delete all the record and re-add them with the new key
+    for (const oldId of updatedSessions.oldIds) {
+        await storeEngine.delete(sessionTableName, oldId);
+    }
+    for (const newSession of updatedSessions.newSessions) {
+        await storeEngine.create(sessionTableName, newSession.id, newSession);
+    }
+}
+exports.migrateToQualifiedSessionIds = migrateToQualifiedSessionIds;

package/lib/notification/NotificationService.d.ts

@@ -41,7 +41,7 @@ export declare class NotificationService extends EventEmitter {
     hasHistory(): Promise<boolean>;
     getNotificationEventList(): Promise<BackendEvent[]>;
     setLastEventDate(eventDate: Date): Promise<Date>;
-    setLastNotificationId(lastNotification: Notification): Promise<string>;
+    private setLastNotificationId;
     processNotificationStream(notificationHandler: NotificationHandler, onMissedNotifications: (notificationId: string) => void, abortHandler: AbortHandler): Promise<{
         total: number;
         error: number;

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;IAsBhD,qBAAqB,CAAC,gBAAgB,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC;IAItE,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,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"}

package/lib/notification/NotificationService.test.js

@@ -103,7 +103,9 @@ describe('NotificationService', () => {
                 jest.spyOn(notificationService, 'handleEvent').mockImplementation(() => {
                     throw new Error('Test error');
                 });
-                const spySetLastNotificationId = jest.spyOn(notificationService, 'setLastNotificationId').mockResolvedValue('');
+                const spySetLastNotificationId = jest
+                    .spyOn(notificationService, 'setLastNotificationId')
+                    .mockResolvedValue('');
                 const notification = {
                     payload: [{}],
                     transient: true,

package/package.json

@@ -59,6 +59,6 @@
     "test:coverage": "jest --coverage",
     "watch": "tsc --watch"
   },
-  "version": "38.0.0-beta.4",
+  "version": "38.0.0-beta.6",
   "gitHead": "5339f01fe01ef0871da8c8bc8662fbe9e604754a"
 }