@wireapp/core 42.23.1 → 42.24.0

package/lib/Account.js

@@ -324,10 +324,6 @@ class Account extends commons_1.TypedEventEmitter {
         const [clientType, cryptoClient] = await this.buildCryptoClient(context, this.storeEngine);
         let mlsService;
         let e2eIdentityService;
-        if (clientType === CryptoClient_1.CryptoClientType.CORE_CRYPTO && (await this.isMlsEnabled())) {
-            e2eIdentityService = new E2EIdentityService_1.E2EIServiceExternal(cryptoClient.getNativeClient());
-            mlsService = new mls_1.MLSService(this.apiClient, cryptoClient.getNativeClient(), this.db, this.recurringTaskScheduler, Object.assign({}, (_a = this.cryptoProtocolConfig) === null || _a === void 0 ? void 0 : _a.mls));
-        }
         const proteusService = new proteus_1.ProteusService(this.apiClient, cryptoClient, {
             onNewClient: payload => this.emit(EVENTS.NEW_SESSION, payload),
             nbPrekeys: this.nbPrekeys,
@@ -343,6 +339,10 @@ class Account extends commons_1.TypedEventEmitter {
         const teamService = new team_2.TeamService(this.apiClient);
         const broadcastService = new broadcast_1.BroadcastService(this.apiClient, proteusService);
         const userService = new user_1.UserService(this.apiClient);
+        if (clientType === CryptoClient_1.CryptoClientType.CORE_CRYPTO && (await this.isMlsEnabled())) {
+            e2eIdentityService = new E2EIdentityService_1.E2EIServiceExternal(cryptoClient.getNativeClient(), clientService);
+            mlsService = new mls_1.MLSService(this.apiClient, cryptoClient.getNativeClient(), this.db, this.recurringTaskScheduler, Object.assign({}, (_a = this.cryptoProtocolConfig) === null || _a === void 0 ? void 0 : _a.mls));
+        }
         this.service = {
             e2eIdentity: e2eIdentityService,
             mls: mlsService,

package/lib/messagingProtocols/mls/E2EIdentityService/E2EIServiceExternal.d.ts

@@ -1,12 +1,14 @@
 import { QualifiedId } from '@wireapp/api-client/lib/user';
 import { Ciphersuite, CoreCrypto, E2eiConversationState, WireIdentity } from '@wireapp/core-crypto';
+import { ClientService } from '../../../client';
 export type DeviceIdentity = Omit<WireIdentity, 'free'> & {
     deviceId: string;
 };
 export declare class E2EIServiceExternal {
-    private coreCryptoClient;
+    private readonly coreCryptoClient;
+    private readonly clientService;
     private readonly logger;
-    constructor(coreCryptoClient: CoreCrypto);
+    constructor(coreCryptoClient: CoreCrypto, clientService: ClientService);
     hasActiveCertificate(): boolean;
     getCertificateData(): string | undefined;
     isEnrollmentInProgress(): boolean;
@@ -15,5 +17,6 @@ export declare class E2EIServiceExternal {
     isE2EIEnabled(ciphersuite: Ciphersuite): Promise<boolean>;
     getUsersIdentities(groupId: string, userIds: QualifiedId[]): Promise<Map<string, DeviceIdentity[]>>;
     getDevicesIdentities(groupId: string, userClientsMap: Record<string, QualifiedId>): Promise<DeviceIdentity[]>;
+    isFreshMLSSelfClient(): Promise<boolean>;
 }
 //# sourceMappingURL=E2EIServiceExternal.d.ts.map

package/lib/messagingProtocols/mls/E2EIdentityService/E2EIServiceExternal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"E2EIServiceExternal.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/mls/E2EIdentityService/E2EIServiceExternal.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AAIzD,OAAO,EAAC,WAAW,EAAE,UAAU,EAAE,qBAAqB,EAAE,YAAY,EAAC,MAAM,sBAAsB,CAAC;AAOlG,MAAM,MAAM,cAAc,GAAG,IAAI,CAAC,YAAY,EAAE,MAAM,CAAC,GAAG;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAC,CAAC;AAG7E,qBAAa,mBAAmB;IAGX,OAAO,CAAC,gBAAgB;IAF3C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAuD;gBAEnD,gBAAgB,EAAE,UAAU;IAGhD,oBAAoB,IAAI,OAAO;IAK/B,kBAAkB,IAAI,MAAM,GAAG,SAAS;IAUxC,sBAAsB,IAAI,OAAO;IAIjC,gBAAgB,IAAI,IAAI;IAIxB,oBAAoB,CAAC,cAAc,EAAE,UAAU,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAIhF,aAAa,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC;IAInD,kBAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,cAAc,EAAE,CAAC,CAAC;IA4BnG,oBAAoB,CAC/B,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GAC1C,OAAO,CAAC,cAAc,EAAE,CAAC;CAc7B"}
+{"version":3,"file":"E2EIServiceExternal.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/mls/E2EIdentityService/E2EIServiceExternal.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AAIzD,OAAO,EAAC,WAAW,EAAE,UAAU,EAAE,qBAAqB,EAAE,YAAY,EAAC,MAAM,sBAAsB,CAAC;AAKlG,OAAO,EAAC,aAAa,EAAC,MAAM,iBAAiB,CAAC;AAG9C,MAAM,MAAM,cAAc,GAAG,IAAI,CAAC,YAAY,EAAE,MAAM,CAAC,GAAG;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAC,CAAC;AAG7E,qBAAa,mBAAmB;IAI5B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,aAAa;IAJhC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAuD;gBAG3D,gBAAgB,EAAE,UAAU,EAC5B,aAAa,EAAE,aAAa;IAIxC,oBAAoB,IAAI,OAAO;IAK/B,kBAAkB,IAAI,MAAM,GAAG,SAAS;IAUxC,sBAAsB,IAAI,OAAO;IAIjC,gBAAgB,IAAI,IAAI;IAIxB,oBAAoB,CAAC,cAAc,EAAE,UAAU,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAIhF,aAAa,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC;IAInD,kBAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,cAAc,EAAE,CAAC,CAAC;IA4BnG,oBAAoB,CAC/B,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GAC1C,OAAO,CAAC,cAAc,EAAE,CAAC;IAef,oBAAoB,IAAI,OAAO,CAAC,OAAO,CAAC;CAItD"}

package/lib/messagingProtocols/mls/E2EIdentityService/E2EIServiceExternal.js

@@ -29,8 +29,9 @@ const E2EIStorage_1 = require("./Storage/E2EIStorage");
 const fullyQualifiedClientIdUtils_1 = require("../../../util/fullyQualifiedClientIdUtils");
 // This export is meant to be accessible from the outside (e.g the Webapp / UI)
 class E2EIServiceExternal {
-    constructor(coreCryptoClient) {
+    constructor(coreCryptoClient, clientService) {
         this.coreCryptoClient = coreCryptoClient;
+        this.clientService = clientService;
         this.logger = (0, logdown_1.default)('@wireapp/core/E2EIdentityServiceExternal');
     }
     // Checks if there is a certificate stored in the local storage
@@ -80,5 +81,9 @@ class E2EIServiceExternal {
         const deviceIdentities = await this.coreCryptoClient.getDeviceIdentities(bazinga64_1.Decoder.fromBase64(groupId).asBytes, clientIds);
         return deviceIdentities.map(identity => (Object.assign(Object.assign({}, identity), { deviceId: (0, fullyQualifiedClientIdUtils_1.parseFullQualifiedClientId)(identity.client_id).client })));
     }
+    async isFreshMLSSelfClient() {
+        const client = await this.clientService.loadClient();
+        return !!client && typeof client.mls_public_keys.ed25519 === 'string' && client.mls_public_keys.ed25519.length > 0;
+    }
 }
 exports.E2EIServiceExternal = E2EIServiceExternal;

package/lib/messagingProtocols/mls/E2EIdentityService/E2EIServiceExternal.test.js

@@ -23,7 +23,8 @@ function buildE2EIService() {
     const coreCrypto = {
         getUserIdentities: jest.fn(),
     };
-    return [new E2EIServiceExternal_1.E2EIServiceExternal(coreCrypto), { coreCrypto }];
+    const clientService = {};
+    return [new E2EIServiceExternal_1.E2EIServiceExternal(coreCrypto, clientService), { coreCrypto }];
 }
 function generateCoreCryptoIdentity({ status = 'Valid', deviceId = 'aaaaa' } = {}) {
     return {

package/lib/messagingProtocols/mls/MLSService/MLSService.js

@@ -473,9 +473,8 @@ class MLSService extends commons_1.TypedEventEmitter {
      * @param client Backend client data
      */
     async uploadMLSPublicKeys(client) {
-        var _a;
         // If we've already updated a client with its public key, there's no need to do it again.
-        if ((_a = client.mls_public_keys) === null || _a === void 0 ? void 0 : _a.ed25519) {
+        if (typeof client.mls_public_keys.ed25519 === 'string' && client.mls_public_keys.ed25519.length > 0) {
             return;
         }
         const publicKey = await this.coreCryptoClient.clientPublicKey(this.config.defaultCiphersuite);

package/lib/messagingProtocols/mls/MLSService/MLSService.test.js

@@ -69,7 +69,7 @@ describe('MLSService', () => {
             apiClient = mockApiClient;
             jest
                 .spyOn(apiClient.api.client, 'getPublicKeys')
-                .mockResolvedValue({ removal: { algo: 'mXOagqRIX/RFd7QyXJA8/Ed8X+hvQgLXIiwYHm3OQFc=' } });
+                .mockResolvedValue({ removal: { ed25519: 'mXOagqRIX/RFd7QyXJA8/Ed8X+hvQgLXIiwYHm3OQFc=' } });
             jest.spyOn(apiClient.api.client, 'claimMLSKeyPackages').mockResolvedValue({ key_packages: [] });
             jest.spyOn(mlsService, 'scheduleKeyMaterialRenewal').mockImplementation();
             jest.spyOn(mlsService, 'processCommitAction').mockImplementation(() => ({

package/package.json

@@ -11,7 +11,7 @@
     "./lib/cryptography/AssetCryptography/crypto.node": "./lib/cryptography/AssetCryptography/crypto.browser.js"
   },
   "dependencies": {
-    "@wireapp/api-client": "^26.5.4",
+    "@wireapp/api-client": "^26.6.0",
     "@wireapp/commons": "^5.2.3",
     "@wireapp/core-crypto": "1.0.0-rc.19",
     "@wireapp/cryptobox": "12.8.0",
@@ -61,6 +61,6 @@
     "test:coverage": "jest --coverage",
     "watch": "tsc --watch"
   },
-  "version": "42.23.1",
-  "gitHead": "173bd1a715a4c060a50de4d0ea52320cd7d4d6da"
+  "version": "42.24.0",
+  "gitHead": "0399e255f145bc060cdfba9517d0c015ee38ec26"
 }