@wireapp/core 27.3.9 → 27.4.2-0

package/package.json

@@ -3,9 +3,11 @@
     "./src/main/cryptography/AssetCryptography/crypto.node": "./src/main/cryptography/AssetCryptography/crypto.browser.js"
   },
   "dependencies": {
+    "@open-wc/webpack-import-meta-loader": "0.4.7",
+    "@otak/core-crypto": "0.2.0-beta-3",
     "@types/long": "4.0.1",
     "@types/node": "~14",
-    "@wireapp/api-client": "19.6.4",
+    "@wireapp/api-client": "19.7.1-1",
     "@wireapp/cryptobox": "12.8.0",
     "bazinga64": "5.10.0",
     "hash.js": "1.1.7",
@@ -69,6 +71,5 @@
     "test:project": "yarn dist && yarn test",
     "test:node": "nyc jasmine --config=jasmine.json"
   },
-  "version": "27.3.9",
-  "gitHead": "484551420463b87202957bc68969cc6d4e8c06a2"
+  "version": "27.4.2-0"
 }

package/src/main/Account.d.ts

@@ -68,6 +68,7 @@ interface AccountOptions {
      *    - make it likely that all prekeys get consumed while the device is offline and the last resort prekey will be used to create new session
      */
     nbPrekeys?: number;
+    enableMLS?: boolean;
 }
 export declare class Account extends EventEmitter {
     private readonly apiClient;
@@ -75,6 +76,8 @@ export declare class Account extends EventEmitter {
     private readonly createStore;
     private storeEngine?;
     private readonly nbPrekeys;
+    private readonly enableMLS;
+    private coreCryptoClient?;
     static readonly TOPIC: typeof TOPIC;
     service?: {
         account: AccountService;
@@ -96,7 +99,7 @@ export declare class Account extends EventEmitter {
      * @param apiClient The apiClient instance to use in the core (will create a new new one if undefined)
      * @param storeEngineProvider
      */
-    constructor(apiClient?: APIClient, { createStore, nbPrekeys }?: AccountOptions);
+    constructor(apiClient?: APIClient, { createStore, nbPrekeys, enableMLS }?: AccountOptions);
     private persistCookie;
     get clientId(): string;
     get userId(): string;
@@ -140,6 +143,7 @@ export declare class Account extends EventEmitter {
     }>;
     initServices(context: Context): Promise<void>;
     loadAndValidateLocalClient(): Promise<RegisteredClient>;
+    private createMLSClient;
     private registerClient;
     private resetContext;
     logout(): Promise<void>;

package/src/main/Account.js

@@ -84,12 +84,13 @@ class Account extends events_1.EventEmitter {
      * @param apiClient The apiClient instance to use in the core (will create a new new one if undefined)
      * @param storeEngineProvider
      */
-    constructor(apiClient = new api_client_1.APIClient(), { createStore = () => undefined, nbPrekeys = 2 } = {}) {
+    constructor(apiClient = new api_client_1.APIClient(), { createStore = () => undefined, nbPrekeys = 2, enableMLS = false } = {}) {
         super();
         this.apiClient = apiClient;
         this.backendFeatures = this.apiClient.backendFeatures;
         this.nbPrekeys = nbPrekeys;
         this.createStore = createStore;
+        this.enableMLS = enableMLS;
         apiClient.on(api_client_1.APIClient.TOPIC.COOKIE_REFRESH, async (cookie) => {
             if (cookie && this.storeEngine) {
                 try {
@@ -256,17 +257,36 @@ class Account extends events_1.EventEmitter {
         const loadedClient = await this.service.client.getLocalClient();
         await this.apiClient.api.client.getClient(loadedClient.id);
         this.apiClient.context.clientId = loadedClient.id;
+        if (this.enableMLS) {
+            this.coreCryptoClient = await this.createMLSClient(loadedClient);
+        }
         return loadedClient;
     }
+    async createMLSClient(client) {
+        const { CoreCrypto } = await Promise.resolve().then(() => __importStar(require('@otak/core-crypto')));
+        const { userId, domain } = this.apiClient.context;
+        return CoreCrypto.init({
+            path: 'path/to/database',
+            key: 'a root identity key (i.e. enclaved encryption key for this device)',
+            clientId: `${userId}:${client.id}@${domain}`,
+        });
+    }
     async registerClient(loginData, clientInfo = coreDefaultClient, entropyData) {
         if (!this.service) {
             throw new Error('Services are not set.');
         }
+        this.logger.info(`Creating new client {mls: ${!!this.enableMLS}}`);
         const registeredClient = await this.service.client.register(loginData, clientInfo, entropyData);
+        if (this.enableMLS) {
+            this.coreCryptoClient = await this.createMLSClient(registeredClient);
+            await this.service.client.uploadMLSPublicKeys(this.coreCryptoClient.clientPublicKey(), registeredClient.id);
+            await this.service.client.uploadMLSKeyPackages(this.coreCryptoClient.clientKeypackages(this.nbPrekeys), registeredClient.id);
+        }
         this.apiClient.context.clientId = registeredClient.id;
-        this.logger.log('Client is created');
+        this.logger.info('Client is created');
         await this.service.notification.initializeNotificationStream();
         await this.service.client.synchronizeClients();
+        await this.service.cryptography.initCryptobox();
         return { isNewClient: true, localClient: registeredClient };
     }
     resetContext() {

package/src/main/client/ClientService.d.ts

@@ -37,4 +37,12 @@ export declare class ClientService {
     createLocalClient(client: RegisteredClient, domain?: string): Promise<MetaClient>;
     synchronizeClients(): Promise<MetaClient[]>;
     register(loginData: LoginData, clientInfo: ClientInfo, entropyData?: Uint8Array): Promise<RegisteredClient>;
+    /**
+     * Will make the given client mls capable (generate and upload key packages)
+     *
+     * @param mlsClient Intance of the coreCrypto that represents the mls client
+     * @param clientId The id of the client
+     */
+    uploadMLSPublicKeys(publicKey: Uint8Array, clientId: string): Promise<void>;
+    uploadMLSKeyPackages(keypackages: Uint8Array[], clientId: string): Promise<void>;
 }

package/src/main/client/ClientService.js

@@ -21,6 +21,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ClientService = void 0;
 const client_1 = require("@wireapp/api-client/src/client/");
 const _1 = require("./");
+const bazinga64_1 = require("bazinga64");
 class ClientService {
     constructor(apiClient, storeEngine, cryptographyService) {
         this.apiClient = apiClient;
@@ -96,9 +97,22 @@ class ClientService {
         };
         const client = await this.backend.postClient(newClient);
         await this.createLocalClient(client, this.apiClient.context.domain);
-        await this.cryptographyService.initCryptobox();
         return client;
     }
+    /**
+     * Will make the given client mls capable (generate and upload key packages)
+     *
+     * @param mlsClient Intance of the coreCrypto that represents the mls client
+     * @param clientId The id of the client
+     */
+    async uploadMLSPublicKeys(publicKey, clientId) {
+        return this.backend.putClient(clientId, {
+            mls_public_keys: { ed25519: btoa(bazinga64_1.Converter.arrayBufferViewToBaselineString(publicKey)) },
+        });
+    }
+    async uploadMLSKeyPackages(keypackages, clientId) {
+        return this.backend.uploadMLSKeyPackages(clientId, keypackages.map(keypackage => btoa(bazinga64_1.Converter.arrayBufferViewToBaselineString(keypackage))));
+    }
 }
 exports.ClientService = ClientService;
 //# sourceMappingURL=ClientService.js.map