@wireapp/core 43.1.3 → 43.1.4

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

@@ -1,7 +1,8 @@
 import { QualifiedId } from '@wireapp/api-client/lib/user';
-import { Ciphersuite, CoreCrypto, E2eiConversationState, WireIdentity } from '@wireapp/core-crypto';
+import { Ciphersuite, CoreCrypto, E2eiConversationState, WireIdentity, DeviceStatus } from '@wireapp/core-crypto';
 import { ClientService } from '../../../client';
-export type DeviceIdentity = Omit<WireIdentity, 'free'> & {
+export type DeviceIdentity = Omit<WireIdentity, 'free' | 'status'> & {
+    status?: DeviceStatus;
     deviceId: string;
 };
 export declare class E2EIServiceExternal {

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;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;IAqBnG,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"}
+{"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,EAAE,YAAY,EAAC,MAAM,sBAAsB,CAAC;AAKhH,OAAO,EAAC,aAAa,EAAC,MAAM,iBAAiB,CAAC;AAG9C,MAAM,MAAM,cAAc,GAAG,IAAI,CAAC,YAAY,EAAE,MAAM,GAAG,QAAQ,CAAC,GAAG;IAAC,MAAM,CAAC,EAAE,YAAY,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAC,CAAC;AAG/G,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;IA6CnG,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

@@ -62,10 +62,24 @@ class E2EIServiceExternal {
         return this.coreCryptoClient.e2eiIsEnabled(ciphersuite);
     }
     async getUsersIdentities(groupId, userIds) {
-        const userIdentities = await this.coreCryptoClient.getUserIdentities(bazinga64_1.Decoder.fromBase64(groupId).asBytes, userIds.map(userId => userId.id));
+        const groupIdBytes = bazinga64_1.Decoder.fromBase64(groupId).asBytes;
+        const textDecoder = new TextDecoder();
+        // we get all the devices that have an identity (either valid, expired or revoked)
+        const userIdentities = await this.coreCryptoClient.getUserIdentities(groupIdBytes, userIds.map(userId => userId.id));
+        // We get all the devices in the conversation (in order to get devices that have no identity)
+        const allUsersMLSDevices = (await this.coreCryptoClient.getClientIds(groupIdBytes))
+            .map(id => textDecoder.decode(id))
+            .map(fullyQualifiedId => (0, fullyQualifiedClientIdUtils_1.parseFullQualifiedClientId)(fullyQualifiedId));
         const mappedUserIdentities = new Map();
-        for (const [userId, identities] of userIdentities) {
-            mappedUserIdentities.set(userId, identities.map(identity => (Object.assign(Object.assign({}, identity), { deviceId: (0, fullyQualifiedClientIdUtils_1.parseFullQualifiedClientId)(identity.client_id).client }))));
+        for (const userId of userIds) {
+            const identities = (userIdentities.get(userId.id) || []).map(identity => (Object.assign(Object.assign({}, identity), { deviceId: (0, fullyQualifiedClientIdUtils_1.parseFullQualifiedClientId)(identity.client_id).client })));
+            const basicMLSDevices = allUsersMLSDevices
+                .filter(({ user }) => user === userId.id)
+                // filtering devices that have a valid identity
+                .filter(({ client }) => !identities.map(identity => identity.deviceId).includes(client))
+                // map basic MLS devices to "fake" identity object
+                .map(id => (Object.assign(Object.assign({}, id), { deviceId: id.client, thumbprint: '', user: '', certificate: '', displayName: '', handle: '', clientId: id.client })));
+            mappedUserIdentities.set(userId.id, [...identities, ...basicMLSDevices]);
         }
         return mappedUserIdentities;
     }

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

@@ -19,16 +19,18 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 const E2EIServiceExternal_1 = require("./E2EIServiceExternal");
+const PayloadHelper_1 = require("../../../test/PayloadHelper");
 function buildE2EIService() {
     const coreCrypto = {
         getUserIdentities: jest.fn(),
+        getClientIds: jest.fn().mockResolvedValue([]),
     };
     const clientService = {};
     return [new E2EIServiceExternal_1.E2EIServiceExternal(coreCrypto, clientService), { coreCrypto }];
 }
-function generateCoreCryptoIdentity({ status = 'Valid', deviceId = 'aaaaa' } = {}) {
+function generateCoreCryptoIdentity({ userId, status = 'Valid', deviceId = (0, PayloadHelper_1.getUUID)(), }) {
     return {
-        client_id: `SKHDsEsOS82TrWTHNEsVNA:${deviceId}@elna.wire.link`,
+        client_id: `${userId}:${deviceId}@elna.wire.link`,
         handle: 'adrian_wire2@elna.wire.link',
         display_name: 'Adrian Weiss 2',
         domain: 'elna.wire.link',
@@ -46,12 +48,33 @@ describe('E2EIServiceExternal', () => {
             const user2 = { domain: 'elna.wire.link', id: 'b7d287e4-7bbd-40e0-a550-6b18dcaf5f31' };
             const userIds = [user1, user2];
             coreCrypto.getUserIdentities.mockResolvedValue(new Map([
-                ['48a1c3b0-4b0e-4bcd-93ad-64c7344b1534', [generateCoreCryptoIdentity(), generateCoreCryptoIdentity()]],
-                ['b7d287e4-7bbd-40e0-a550-6b18dcaf5f31', [generateCoreCryptoIdentity()]],
+                [user1.id, [generateCoreCryptoIdentity({ userId: user1.id }), generateCoreCryptoIdentity({ userId: user1.id })]],
+                [user2.id, [generateCoreCryptoIdentity({ userId: user2.id })]],
             ]));
             const userIdentities = await service.getUsersIdentities(groupId, userIds);
-            expect(userIdentities.get(user1.id)).toBeDefined();
-            expect(userIdentities.get(user2.id)).toBeDefined();
+            expect(userIdentities.get(user1.id)).toHaveLength(2);
+            expect(userIdentities.get(user2.id)).toHaveLength(1);
+        });
+        it('returns MLS basic devices with empty identity', async () => {
+            const [service, { coreCrypto }] = buildE2EIService();
+            const user1 = { domain: 'elna.wire.link', id: '48a1c3b0-4b0e-4bcd-93ad-64c7344b1534' };
+            const user2 = { domain: 'elna.wire.link', id: 'b7d287e4-7bbd-40e0-a550-6b18dcaf5f31' };
+            const userIds = [user1, user2];
+            const user1Identities = [
+                generateCoreCryptoIdentity({ userId: user1.id }),
+                generateCoreCryptoIdentity({ userId: user1.id }),
+            ];
+            const encoder = new TextEncoder();
+            coreCrypto.getUserIdentities.mockResolvedValue(new Map([[user1.id, user1Identities]]));
+            const allClients = [
+                ...user1Identities.map(identity => identity.client_id),
+                `${user1.id}:74a50c1f4352b41f@elna.wire.link`,
+                `${user2.id}:452cb4c65f0369a8@elna.wire.link`,
+            ];
+            coreCrypto.getClientIds.mockResolvedValue(allClients.map(clientId => encoder.encode(clientId)));
+            const userIdentities = await service.getUsersIdentities(groupId, userIds);
+            expect(userIdentities.get(user1.id)).toHaveLength(3);
+            expect(userIdentities.get(user2.id)).toHaveLength(1);
         });
     });
 });

package/lib/util/fullyQualifiedClientIdUtils.d.ts

@@ -3,12 +3,13 @@ type UserId = string;
 type ClientId = string;
 type Domain = string;
 export type ClientIdStringType = `${UserId}:${ClientId}@${Domain}`;
-export declare const constructFullyQualifiedClientId: (userId: UserId, clientId: ClientId, domain: Domain) => ClientIdStringType;
-export declare const parseFullQualifiedClientId: (qualifiedId: string) => {
+export type ParsedFullyQualifiedId = {
     user: UserId;
     client: ClientId;
     domain: Domain;
 };
+export declare const constructFullyQualifiedClientId: (userId: UserId, clientId: ClientId, domain: Domain) => ClientIdStringType;
+export declare const parseFullQualifiedClientId: (qualifiedId: string) => ParsedFullyQualifiedId;
 export declare const mapQualifiedUserClientIdsToFullyQualifiedClientIds: (qualifiedUserMap: QualifiedUserClientMap) => `${string}:${string}@${string}`[];
 export {};
 //# sourceMappingURL=fullyQualifiedClientIdUtils.d.ts.map

package/lib/util/fullyQualifiedClientIdUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fullyQualifiedClientIdUtils.d.ts","sourceRoot":"","sources":["../../src/util/fullyQualifiedClientIdUtils.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,sBAAsB,EAAC,MAAM,gCAAgC,CAAC;AAEtE,KAAK,MAAM,GAAG,MAAM,CAAC;AACrB,KAAK,QAAQ,GAAG,MAAM,CAAC;AACvB,KAAK,MAAM,GAAG,MAAM,CAAC;AACrB,MAAM,MAAM,kBAAkB,GAAG,GAAG,MAAM,IAAI,QAAQ,IAAI,MAAM,EAAE,CAAC;AAEnE,eAAO,MAAM,+BAA+B,WAClC,MAAM,YACJ,QAAQ,UACV,MAAM,KACb,kBAAuD,CAAC;AAE3D,eAAO,MAAM,0BAA0B,gBAAiB,MAAM;UAAU,MAAM;YAAU,QAAQ;YAAU,MAAM;CAO/G,CAAC;AAEF,eAAO,MAAM,kDAAkD,qBAAsB,sBAAsB,sCAO1G,CAAC"}
+{"version":3,"file":"fullyQualifiedClientIdUtils.d.ts","sourceRoot":"","sources":["../../src/util/fullyQualifiedClientIdUtils.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,sBAAsB,EAAC,MAAM,gCAAgC,CAAC;AAEtE,KAAK,MAAM,GAAG,MAAM,CAAC;AACrB,KAAK,QAAQ,GAAG,MAAM,CAAC;AACvB,KAAK,MAAM,GAAG,MAAM,CAAC;AACrB,MAAM,MAAM,kBAAkB,GAAG,GAAG,MAAM,IAAI,QAAQ,IAAI,MAAM,EAAE,CAAC;AACnE,MAAM,MAAM,sBAAsB,GAAG;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,QAAQ,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAC,CAAC;AAEtF,eAAO,MAAM,+BAA+B,WAClC,MAAM,YACJ,QAAQ,UACV,MAAM,KACb,kBAAuD,CAAC;AAE3D,eAAO,MAAM,0BAA0B,gBAAiB,MAAM,KAAG,sBAOhE,CAAC;AAEF,eAAO,MAAM,kDAAkD,qBAAsB,sBAAsB,sCAO1G,CAAC"}

package/package.json

@@ -11,16 +11,16 @@
     "./lib/cryptography/AssetCryptography/crypto.node": "./lib/cryptography/AssetCryptography/crypto.browser.js"
   },
   "dependencies": {
-    "@wireapp/api-client": "^26.7.1",
+    "@wireapp/api-client": "^26.7.2",
     "@wireapp/commons": "^5.2.3",
     "@wireapp/core-crypto": "1.0.0-rc.21",
     "@wireapp/cryptobox": "12.8.0",
     "@wireapp/promise-queue": "^2.2.8",
     "@wireapp/protocol-messaging": "1.44.0",
-    "@wireapp/store-engine": "5.1.4",
-    "@wireapp/store-engine-dexie": "^2.1.6",
+    "@wireapp/store-engine": "5.1.5",
+    "@wireapp/store-engine-dexie": "^2.1.7",
     "axios": "1.6.2",
-    "bazinga64": "^6.3.3",
+    "bazinga64": "^6.3.4",
     "deepmerge-ts": "5.1.0",
     "hash.js": "1.1.7",
     "http-status-codes": "2.3.0",
@@ -61,6 +61,6 @@
     "test:coverage": "jest --coverage",
     "watch": "tsc --watch"
   },
-  "version": "43.1.3",
-  "gitHead": "b4317987f262401036da1dcd98e12ef8b27e4d71"
+  "version": "43.1.4",
+  "gitHead": "0008113a715828f838fbb8f0eeb1844be78747ab"
 }