@wireapp/core 28.6.1 → 28.7.0

package/CHANGELOG.md

@@ -3,6 +3,33 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [28.7.0](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/compare/@wireapp/core@28.6.3...@wireapp/core@28.7.0) (2022-07-20)
+
+
+### Features
+
+* **core:** update core-crypto and pass entropy to crypto-core ([#4336](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/issues/4336)) ([0cc685f](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/commit/0cc685f90ee7100b4930f9a59de4aece4ed62ba7))
+
+
+
+
+
+## [28.6.3](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/compare/@wireapp/core@28.6.2...@wireapp/core@28.6.3) (2022-07-19)
+
+**Note:** Version bump only for package @wireapp/core
+
+
+
+
+
+## [28.6.2](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/compare/@wireapp/core@28.6.1...@wireapp/core@28.6.2) (2022-07-19)
+
+**Note:** Version bump only for package @wireapp/core
+
+
+
+
+
 ## [28.6.1](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/compare/@wireapp/core@28.6.0...@wireapp/core@28.6.1) (2022-07-18)
 
 **Note:** Version bump only for package @wireapp/core

package/package.json

@@ -4,10 +4,10 @@
   },
   "dependencies": {
     "@open-wc/webpack-import-meta-loader": "0.4.7",
-    "@otak/core-crypto": "0.3.0-beta-1",
+    "@otak/core-crypto": "0.3.0-beta-2",
     "@types/long": "4.0.1",
     "@types/node": "~14",
-    "@wireapp/api-client": "19.16.0",
+    "@wireapp/api-client": "19.16.1",
     "@wireapp/commons": "4.3.0",
     "@wireapp/cryptobox": "12.8.0",
     "@wireapp/store-engine-dexie": "1.6.10",
@@ -77,6 +77,6 @@
     "test:node": "nyc jasmine --config=jasmine.json",
     "watch": "tsc ---watch"
   },
-  "version": "28.6.1",
-  "gitHead": "3b88618474db604856f9ea32e935723e2f9c11b7"
+  "version": "28.7.0",
+  "gitHead": "81ee05d7db9fafc791e28648cc6a859faa5398e3"
 }

package/src/main/Account.d.ts

@@ -162,7 +162,7 @@ export declare class Account<T = any> extends EventEmitter {
         localClient: RegisteredClient;
     }>;
     initServices(context: Context): Promise<void>;
-    loadAndValidateLocalClient(): Promise<RegisteredClient>;
+    loadAndValidateLocalClient(entropyData?: Uint8Array): Promise<RegisteredClient>;
     private createMLSClient;
     private registerClient;
     private resetContext;

package/src/main/Account.js

@@ -178,7 +178,7 @@ class Account extends events_1.EventEmitter {
             throw new Error('Services are not set.');
         }
         try {
-            const localClient = await this.loadAndValidateLocalClient();
+            const localClient = await this.loadAndValidateLocalClient(entropyData);
             return { isNewClient: false, localClient };
         }
         catch (error) {
@@ -254,17 +254,17 @@ class Account extends events_1.EventEmitter {
             user: userService,
         };
     }
-    async loadAndValidateLocalClient() {
+    async loadAndValidateLocalClient(entropyData) {
         await this.service.cryptography.initCryptobox();
         const loadedClient = await this.service.client.getLocalClient();
         await this.apiClient.api.client.getClient(loadedClient.id);
         this.apiClient.context.clientId = loadedClient.id;
         if (this.mlsConfig) {
-            this.coreCryptoClient = await this.createMLSClient(loadedClient, this.apiClient.context, this.mlsConfig);
+            this.coreCryptoClient = await this.createMLSClient(loadedClient, this.apiClient.context, this.mlsConfig, entropyData);
         }
         return loadedClient;
     }
-    async createMLSClient(client, context, mlsConfig) {
+    async createMLSClient(client, context, mlsConfig, entropyData) {
         const coreCryptoKeyId = 'corecrypto-key';
         const { CoreCrypto } = await Promise.resolve().then(() => __importStar(require('@otak/core-crypto')));
         const dbName = `secrets-${this.generateDbName(context)}`;
@@ -282,6 +282,7 @@ class Account extends events_1.EventEmitter {
             key: bazinga64_1.Encoder.toBase64(key).asString,
             clientId: `${userId}:${client.id}@${domain}`,
             wasmFilePath: mlsConfig.coreCrypoWasmFilePath,
+            entropySeed: entropyData,
         });
     }
     async registerClient(loginData, clientInfo = coreDefaultClient, entropyData) {
@@ -291,8 +292,8 @@ class Account extends events_1.EventEmitter {
         this.logger.info(`Creating new client {mls: ${!!this.mlsConfig}}`);
         const registeredClient = await this.service.client.register(loginData, clientInfo, entropyData);
         if (this.mlsConfig) {
-            this.coreCryptoClient = await this.createMLSClient(registeredClient, this.apiClient.context, this.mlsConfig);
-            await this.service.client.uploadMLSPublicKeys(this.coreCryptoClient.clientPublicKey(), registeredClient.id);
+            this.coreCryptoClient = await this.createMLSClient(registeredClient, this.apiClient.context, this.mlsConfig, entropyData);
+            await this.service.client.uploadMLSPublicKeys(await this.coreCryptoClient.clientPublicKey(), registeredClient.id);
             await this.service.client.uploadMLSKeyPackages(await this.coreCryptoClient.clientKeypackages(this.nbPrekeys), registeredClient.id);
         }
         this.apiClient.context.clientId = registeredClient.id;
@@ -380,7 +381,7 @@ class Account extends events_1.EventEmitter {
     }
     generateDbName(context) {
         const clientType = context.clientType === client_1.ClientType.NONE ? '' : `@${context.clientType}`;
-        return `wire@${this.apiClient.config.urls.name}@${context.userId}@${context.clientId}${clientType}`;
+        return `wire@${this.apiClient.config.urls.name}@${context.userId}${clientType}`;
     }
     async initEngine(context) {
         const dbName = this.generateDbName(context);