npm - @wireapp/core - Versions diffs - 38.8.1 → 38.8.3 - Mend

@wireapp/core 38.8.1 → 38.8.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (17) hide show

package/lib/conversation/ConversationService/ConversationService.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ConversationService.d.ts","sourceRoot":"","sources":["../../../src/conversation/ConversationService/ConversationService.ts"],"names":[],"mappings":"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~~IAsBhC~~,oBAAoB,CAAC,cAAc,EAAE,WAAW;IAI7D;;;;;OAKG;IACU,wBAAwB,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;IAiBvD,4BAA4B,CAAC,OAAO,EAAE,MAAM;IAI5C,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;YAIlD,YAAY;IAYb,mBAAmB;CA2BjC"}
1	+ {"version":3,"file":"ConversationService.d.ts","sourceRoot":"","sources":["../../../src/conversation/ConversationService/ConversationService.ts"],"names":[],"mappings":"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"}

package/lib/conversation/ConversationService/ConversationService.js CHANGED Viewed

@@ -250,10 +250,9 @@ class ConversationService {
         };
     }
     async removeUsersFromMLSConversation({ groupId, conversationId, qualifiedUserIds, }) {
-        const groupIdBytes = bazinga64_1.Decoder.fromBase64(groupId).asBytes;
         const clientsToRemove = await this.apiClient.api.user.postListClients({ qualified_users: qualifiedUserIds });
         const fullyQualifiedClientIds = (0, fullyQualifiedClientIdUtils_1.mapQualifiedUserClientIdsToFullyQualifiedClientIds)(clientsToRemove.qualified_user_map);
-        const messageResponse = await this.mlsService.removeClientsFromConversation(groupIdBytes, fullyQualifiedClientIds);
+        const messageResponse = await this.mlsService.removeClientsFromConversation(groupId, fullyQualifiedClientIds);
         //key material gets updated after removing a user from the group, so we can reset last key update time value in the store
         this.mlsService.resetKeyMaterialRenewal(groupId);
         const conversation = await this.getConversation(conversationId);

package/lib/messagingProtocols/mls/MLSService/MLSService.d.ts CHANGED Viewed

@@ -28,6 +28,8 @@ export declare class MLSService extends TypedEventEmitter<Events> {
     logger: logdown.Logger;
     config: MLSServiceConfig;
     groupIdFromConversationId?: MLSCallbacks['groupIdFromConversationId'];
+    private readonly textEncoder;
+    private readonly textDecoder;
     constructor(apiClient: APIClient, coreCryptoClient: CoreCrypto, { keyingMaterialUpdateThreshold, nbKeyPackages, }: Partial<MLSServiceConfig>);
     initClient(userId: QualifiedId, clientId: string): Promise<void>;
     createClient(userId: QualifiedId, clientId: string): Promise<void>;
@@ -74,7 +76,12 @@ export declare class MLSService extends TypedEventEmitter<Events> {
         user: QualifiedId;
         client?: string;
     }): Promise<PostMlsMessageResponse | null | undefined>;
-    removeClientsFromConversation(conversationId: ConversationId, clientIds: Uint8Array[]): Promise<PostMlsMessageResponse | null>;
+    /**
+     * Will send a removal commit for given clients
+     * @param groupId groupId of the conversation
+     * @param clientIds the list of **qualified** ids of the clients we want to remove from the group
+     */
+    removeClientsFromConversation(groupId: string, clientIds: string[]): Promise<PostMlsMessageResponse | null>;
     private commitProposals;
     conversationExists(groupId: string): Promise<boolean>;
     clientValidKeypackagesCount(): Promise<number>;

package/lib/messagingProtocols/mls/MLSService/MLSService.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"MLSService.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/mls/MLSService/MLSService.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,sBAAsB,EAAqB,MAAM,sCAAsC,CAAC;AAChG,OAAO,EAAC,eAAe,EAAC,MAAM,sDAAsD,CAAC;AACrF,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AAIzD,OAAO,OAAO,MAAM,SAAS,CAAC;AAE9B,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAE9C,OAAO,EACL,eAAe,EAGf,cAAc,EACd,UAAU,EACV,gBAAgB,EAChB,oBAAoB,EACpB,oBAAoB,EACpB,0BAA0B,EAC1B,OAAO,EACP,YAAY,EACZ,YAAY,EACZ,kBAAkB,EACnB,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EAAC,gBAAgB,EAAsB,MAAM,oBAAoB,CAAC;AAKzE,OAAO,EAAC,cAAc,EAAC,MAAM,uBAAuB,CAAC;AAKrD,OAAO,EAAC,iBAAiB,EAAC,MAAM,iCAAiC,CAAC;AAClE,OAAO,EAAC,kBAAkB,EAAC,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAC,kBAAkB,EAAqB,MAAM,iBAAiB,CAAC;AACvE,OAAO,EAAC,4BAA4B,EAAE,4BAA4B,EAAE,YAAY,EAAC,MAAM,UAAU,CAAC;AAIlG,eAAO,MAAM,oBAAoB,UAAW,UAAU,GAAG,EAAE,KAAG,UAE7D,CAAC;AAOF,MAAM,WAAW,8BAA8B;IAC7C,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,OAAO,CAAC;CACrB;AAED,KAAK,MAAM,GAAG;IACZ,QAAQ,EAAE;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAC,CAAC;CAC5C,CAAC;AACF,qBAAa,UAAW,SAAQ,iBAAiB,CAAC,MAAM,CAAC;~~IAMrD~~,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;~~IANnC~~,MAAM,iBAAuC;IAC7C,MAAM,EAAE,gBAAgB,CAAC;IACzB,yBAAyB,CAAC,EAAE,YAAY,CAAC,2BAA2B,CAAC,CAAC;~~gBAGnD~~,SAAS,EAAE,SAAS,EACpB,gBAAgB,EAAE,UAAU,EAC7C,EACE,6BAA2E,EAC3E,aAA2C,GAC5C,EAAE,OAAO,CAAC,gBAAgB,CAAC;IASjB,UAAU,CAAC,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM;~~IAMhD~~,YAAY,CAAC,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM;YASjD,kBAAkB;IAqCzB,8BAA8B,CAAC,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE;IAItE,qBAAqB,CAAC,EAAC,yBAAyB,EAAE,GAAG,mBAAmB,EAAC,EAAE,YAAY,GAAG,IAAI;~~IAexF~~,qBAAqB,CAAC,cAAc,EAAE,cAAc,EAAE;IA6B5D,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,UAAU;IAK/B,WAAW,CAAC,YAAY,EAAE,YAAY,EAAE,IAAI,EAAE,YAAY,GAAG,eAAe,GAAG,kBAAkB;IAIjG,oBAAoB,CAAC,YAAY,EAAE,MAAM,OAAO,CAAC,UAAU,CAAC;IAa5D,4BAA4B,CAAC,cAAc,EAAE,WAAW,GAAG,OAAO,CAAC,eAAe,CAAC;YAIlF,+BAA+B;IAO7C;;;;;OAKG;IACU,6BAA6B,CAAC,cAAc,EAAE,WAAW,GAAG,OAAO,CAAC,eAAe,CAAC;IAuCpF,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAMpE,mBAAmB,CAC9B,oBAAoB,EAAE,oBAAoB,EAC1C,IAAI,EAAE,oBAAoB,GAAG,0BAA0B;IAK5C,qBAAqB,CAAC,cAAc,EAAE,UAAU,GAAG,OAAO,CAAC,cAAc,CAAC;IAI1E,cAAc,CAAC,cAAc,EAAE,cAAc,EAAE,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAI9F,cAAc,CAAC,cAAc,EAAE,cAAc,EAAE,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;IAIrG;;;;;;;;;OASG;YACW,mBAAmB;IAQ1B,oBAAoB,CAAC,cAAc,EAAE,cAAc;IAI1D;;;;;OAKG;IACU,oBAAoB,CAC/B,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,WAAW,EAAE,EACpB,OAAO,CAAC,EAAE;QAAC,IAAI,EAAE,WAAW,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAC,GAC7C,OAAO,CAAC,sBAAsB,GAAG,IAAI,GAAG,SAAS,CAAC;~~IAqC9C~~,6BAA6B,CAAC,~~cAAc~~,EAAE,~~cAAc~~,EAAE,SAAS,EAAE,~~UAAU~~,EAAE;~~YAM9E~~,eAAe;IAKhB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAKrD,2BAA2B,IAAI,OAAO,CAAC,MAAM,CAAC;IAI9C,iBAAiB,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;IAI9E;;;;OAIG;YACW,gBAAgB;IAgB9B,OAAO,CAAC,sCAAsC;IAI9C;;;OAGG;IACI,uBAAuB,CAAC,OAAO,EAAE,MAAM;IAK9C;;;OAGG;IACI,0BAA0B,CAAC,OAAO,EAAE,MAAM;IAUjD;;;OAGG;IACI,0BAA0B;IASjC;;;OAGG;IACI,8BAA8B;YAQvB,eAAe;IAmB7B;;;;;OAKG;YACW,mBAAmB;YAMnB,oBAAoB;IAOrB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAKhD,WAAW,CAAC,MAAM,EAAE,IAAI,CAAC,kBAAkB,EAAE,YAAY,CAAC,GAAG,kBAAkB;IAO5F;;;;;OAKG;IACU,4BAA4B,CACvC,uBAAuB,EAAE,WAAW,EACpC,iBAAiB,CAAC,EAAE,MAAM,GACzB,OAAO,CAAC,MAAM,CAAC;IAYlB;;;;;;;OAOG;IACU,sBAAsB,CAAC,EAAC,SAAS,EAAE,OAAO,EAAE,SAAS,EAAC,EAAE,4BAA4B;IAoBjG;;;;;OAKG;IACU,sBAAsB,CAAC,EAAC,OAAO,EAAE,UAAkB,EAAC,EAAE,4BAA4B;IAa/F;;;;OAIG;IACU,6BAA6B;IAiB1C;;;;OAIG;IACU,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAC,EAAE,CAAC;~~CAY1G~~"}
1	+ {"version":3,"file":"MLSService.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/mls/MLSService/MLSService.ts"],"names":[],"mappings":"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"}

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

@@ -65,15 +65,16 @@ class MLSService extends TypedEventEmitter_1.TypedEventEmitter {
         this.apiClient = apiClient;
         this.coreCryptoClient = coreCryptoClient;
         this.logger = (0, logdown_1.default)('@wireapp/core/MLSService');
+        this.textEncoder = new TextEncoder();
+        this.textDecoder = new TextDecoder();
         this.config = {
             keyingMaterialUpdateThreshold,
             nbKeyPackages,
         };
     }
     async initClient(userId, clientId) {
-        const encoder = new TextEncoder();
         const qualifiedClientId = (0, fullyQualifiedClientIdUtils_1.constructFullyQualifiedClientId)(userId.id, clientId, userId.domain);
-        await this.coreCryptoClient.mlsInit(encoder.encode(qualifiedClientId));
+        await this.coreCryptoClient.mlsInit(this.textEncoder.encode(qualifiedClientId));
     }
     async createClient(userId, clientId) {
         await this.initClient(userId, clientId);
@@ -123,10 +124,9 @@ class MLSService extends TypedEventEmitter_1.TypedEventEmitter {
     configureMLSCallbacks(_a) {
         var { groupIdFromConversationId } = _a, coreCryptoCallbacks = __rest(_a, ["groupIdFromConversationId"]);
         this.coreCryptoClient.registerCallbacks(Object.assign(Object.assign({}, coreCryptoCallbacks), { clientIsExistingGroupUser: (client, otherClients) => {
-                const decoder = new TextDecoder();
-                const { user } = (0, fullyQualifiedClientIdUtils_1.parseFullQualifiedClientId)(decoder.decode(client));
+                const { user } = (0, fullyQualifiedClientIdUtils_1.parseFullQualifiedClientId)(this.textDecoder.decode(client));
                 return otherClients.some(client => {
-                    const { user: otherUser } = (0, fullyQualifiedClientIdUtils_1.parseFullQualifiedClientId)(decoder.decode(client));
+                    const { user: otherUser } = (0, fullyQualifiedClientIdUtils_1.parseFullQualifiedClientId)(this.textDecoder.decode(client));
                     return otherUser.toLowerCase() === user.toLowerCase();
                 });
             } }));
@@ -284,8 +284,14 @@ class MLSService extends TypedEventEmitter_1.TypedEventEmitter {
         this.scheduleKeyMaterialRenewal(groupId);
         return response;
     }
-    removeClientsFromConversation(conversationId, clientIds) {
-        return this.processCommitAction(conversationId, () => this.coreCryptoClient.removeClientsFromConversation(conversationId, clientIds));
+    /**
+     * Will send a removal commit for given clients
+     * @param groupId groupId of the conversation
+     * @param clientIds the list of **qualified** ids of the clients we want to remove from the group
+     */
+    removeClientsFromConversation(groupId, clientIds) {
+        const groupIdBytes = bazinga64_1.Decoder.fromBase64(groupId).asBytes;
+        return this.processCommitAction(groupIdBytes, () => this.coreCryptoClient.removeClientsFromConversation(groupIdBytes, clientIds.map(id => this.textEncoder.encode(id))));
     }
     async commitProposals(groupId) {
         const commitBundle = await this.coreCryptoClient.commitPendingProposals(groupId);
@@ -493,10 +499,9 @@ class MLSService extends TypedEventEmitter_1.TypedEventEmitter {
      */
     async getClientIds(groupId) {
         const groupIdBytes = bazinga64_1.Decoder.fromBase64(groupId).asBytes;
-        const decoder = new TextDecoder();
         const rawClientIds = await this.coreCryptoClient.getClientIds(groupIdBytes);
         const clientIds = rawClientIds.map(id => {
-            const { user, client, domain } = (0, fullyQualifiedClientIdUtils_1.parseFullQualifiedClientId)(decoder.decode(id));
+            const { user, client, domain } = (0, fullyQualifiedClientIdUtils_1.parseFullQualifiedClientId)(this.textDecoder.decode(id));
             return { userId: user, clientId: client, domain };
         });
         return clientIds;

package/lib/messagingProtocols/proteus/ProteusService/ProteusService.mocks.d.ts CHANGED Viewed

@@ -1,8 +1,8 @@
 import { APIClient } from '@wireapp/api-client';
-import { CoreCrypto } from '@wireapp/core-crypto';
+import { CryptoClient } from './CryptoClient';
 import { ProteusService } from './ProteusService';
 export declare const buildProteusService: (federated?: boolean) => Promise<[ProteusService, {
     apiClient: APIClient;
-    coreCrypto: CoreCrypto;
+    cryptoClient: CryptoClient;
 }]>;
 //# sourceMappingURL=ProteusService.mocks.d.ts.map

package/lib/messagingProtocols/proteus/ProteusService/ProteusService.mocks.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ProteusService.mocks.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/proteus/ProteusService/ProteusService.mocks.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;~~AAC9C~~,OAAO,EAAC,~~UAAU~~,EAAC,MAAM,~~sBAAsB~~,CAAC;~~AAGhD~~,OAAO,EAAC,cAAc,EAAC,MAAM,kBAAkB,CAAC;AAIhD,eAAO,MAAM,mBAAmB;eAEQ,SAAS;~~gBAAc~~,~~UAAU~~;~~GAgBxE~~,CAAC"}
1	+ {"version":3,"file":"ProteusService.mocks.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/proteus/ProteusService/ProteusService.mocks.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAE9C,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAC;AAE5C,OAAO,EAAC,cAAc,EAAC,MAAM,kBAAkB,CAAC;AAIhD,eAAO,MAAM,mBAAmB;eAEQ,SAAS;kBAAgB,YAAY;GAgB5E,CAAC"}

package/lib/messagingProtocols/proteus/ProteusService/ProteusService.mocks.js CHANGED Viewed

@@ -21,7 +21,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildProteusService = void 0;
 const client_1 = require("@wireapp/api-client/lib/client");
 const api_client_1 = require("@wireapp/api-client");
-const core_crypto_1 = require("@wireapp/core-crypto");
 const CoreCryptoWrapper_1 = require("./CryptoClient/CoreCryptoWrapper");
 const ProteusService_1 = require("./ProteusService");
 const PayloadHelper_1 = require("../../../test/PayloadHelper");
@@ -32,11 +31,11 @@ const buildProteusService = async (federated = false) => {
         userId: (0, PayloadHelper_1.getUUID)(),
         clientId: (0, PayloadHelper_1.getUUID)(),
     };
-    const coreCrypto = await core_crypto_1.CoreCrypto.deferredInit('store-name', 'key');
-    const proteusService = new ProteusService_1.ProteusService(apiClient, new CoreCryptoWrapper_1.CoreCryptoWrapper(coreCrypto, {}, {}), {
+    const cryptoClient = new CoreCryptoWrapper_1.CoreCryptoWrapper({}, {}, {});
+    const proteusService = new ProteusService_1.ProteusService(apiClient, cryptoClient, {
         nbPrekeys: 0,
         useQualifiedIds: federated,
     });
-    return [proteusService, { apiClient, coreCrypto }];
+    return [proteusService, { apiClient, cryptoClient }];
 };
 exports.buildProteusService = buildProteusService;

package/lib/messagingProtocols/proteus/ProteusService/ProteusService.test.js CHANGED Viewed

@@ -65,7 +65,7 @@ jest.mock('./CryptoClient/PrekeysTracker', () => {
 jest.mock('../Utility/Recipients', () => (Object.assign(Object.assign({}, jest.requireActual('../Utility/Recipients')), { getRecipientsForConversation: jest.fn(), getQualifiedRecipientsForConversation: jest.fn() })));
 const MockedRecipients = Recipients;
 const prepareDataForEncryption = async (useQualifiedIds = true) => {
-    const [proteusService, { coreCrypto, apiClient }] = await (0, ProteusService_mocks_1.buildProteusService)(useQualifiedIds);
+    const [proteusService, { cryptoClient, apiClient }] = await (0, ProteusService_mocks_1.buildProteusService)(useQualifiedIds);
     const domain = 'staging.zinfra.io';
     //user 1
     const firstUserId = 'bc0c99f1-49a5-4ad2-889a-62885af37088';
@@ -88,7 +88,7 @@ const prepareDataForEncryption = async (useQualifiedIds = true) => {
     //user 2
     const secondUserId = 'cd0c88f1-49a5-4ar2-889a-62885af37069';
     //user 2 client
-    const thirdClientId = 'be67218b77d02d69';
+    const thirdClientId = 'ce67218b77d02d69';
     //user 2 sessions
     const secondClientSessionId = (0, SessionHandler_1.constructSessionId)({
         userId: secondUserId,
@@ -107,7 +107,7 @@ const prepareDataForEncryption = async (useQualifiedIds = true) => {
         key: 'pQABARn//wKhAFggJ1Fbpg5l6wnzKOJE+vXpRnkqUYhIvVnR5lNXEbO2o/0DoQChAFggHxZvgvtDktY/vqBcpjjo6rQnXvcNQhfwmy8AJQJKlD0E9g==',
     };
     return {
-        services: { proteusService, apiClient, coreCryptoClient: coreCrypto },
+        services: { proteusService, apiClient, cryptoClient },
         data: {
             firstUser: {
                 id: firstUserId,
@@ -130,29 +130,35 @@ const prepareDataForEncryption = async (useQualifiedIds = true) => {
 describe('ProteusService', () => {
     describe('getRemoteFingerprint', () => {
         it('create a session if session does not exists', async () => {
-            const [proteusService, { apiClient, coreCrypto }] = await (0, ProteusService_mocks_1.buildProteusService)();
+            const [proteusService, { apiClient, cryptoClient }] = await (0, ProteusService_mocks_1.buildProteusService)();
             const expectedFingerprint = 'fingerprint-client1';
-            const getPrekeyMock = jest.spyOn(apiClient.api.user, 'getClientPreKey').mockResolvedValue({
-                client: 'client1',
-                prekey: {
-                    id: 123,
-                    key: 'pQABARhIAqEAWCCaJpFa9c626ORmjj1aV6OnOYgmTjfoiE3ynOfNfGAOmgOhAKEAWCD60VMzRrLfO+1GSjgyhnVp2N7L58DM+eeJhZJi1tBLfQT2',
-                },
-            });
-            jest.spyOn(coreCrypto, 'proteusFingerprintRemote').mockResolvedValue(expectedFingerprint);
-            jest.spyOn(coreCrypto, 'proteusSessionExists').mockResolvedValue(false);
             const userId = { id: 'user1', domain: 'domain.com' };
             const clientId = 'client1';
+            jest.spyOn(apiClient.api.user, 'postQualifiedMultiPreKeyBundles').mockResolvedValue({
+                [userId.domain]: {
+                    [userId.id]: {
+                        [clientId]: {
+                            id: 123,
+                            key: 'pQABARhIAqEAWCCaJpFa9c626ORmjj1aV6OnOYgmTjfoiE3ynOfNfGAOmgOhAKEAWCD60VMzRrLfO+1GSjgyhnVp2N7L58DM+eeJhZJi1tBLfQT2',
+                        },
+                    },
+                },
+            });
+            jest.spyOn(cryptoClient, 'getRemoteFingerprint').mockResolvedValue(expectedFingerprint);
+            jest.spyOn(cryptoClient, 'sessionFromPrekey').mockResolvedValue(undefined);
+            jest.spyOn(cryptoClient, 'saveSession').mockResolvedValue(undefined);
+            jest.spyOn(cryptoClient, 'sessionExists').mockResolvedValue(false);
             const result = await proteusService.getRemoteFingerprint(userId, clientId);
-            expect(getPrekeyMock).toHaveBeenCalledWith(userId, clientId);
             expect(result).toBe(expectedFingerprint);
         });
         it('create a session from given prekey if session does not exists', async () => {
-            const [proteusService, { apiClient, coreCrypto }] = await (0, ProteusService_mocks_1.buildProteusService)();
+            const [proteusService, { apiClient, cryptoClient }] = await (0, ProteusService_mocks_1.buildProteusService)();
             const expectedFingerprint = 'fingerprint-client1';
             const getPrekeyMock = jest.spyOn(apiClient.api.user, 'getClientPreKey');
-            jest.spyOn(coreCrypto, 'proteusFingerprintRemote').mockResolvedValue(expectedFingerprint);
-            jest.spyOn(coreCrypto, 'proteusSessionExists').mockResolvedValue(false);
+            jest.spyOn(cryptoClient, 'getRemoteFingerprint').mockResolvedValue(expectedFingerprint);
+            jest.spyOn(cryptoClient, 'sessionFromPrekey').mockResolvedValue(undefined);
+            jest.spyOn(cryptoClient, 'saveSession').mockResolvedValue(undefined);
+            jest.spyOn(cryptoClient, 'sessionExists').mockResolvedValue(false);
             const userId = { id: 'user1', domain: 'domain.com' };
             const clientId = 'client1';
             const result = await proteusService.getRemoteFingerprint(userId, clientId, {
@@ -163,12 +169,12 @@ describe('ProteusService', () => {
             expect(result).toBe(expectedFingerprint);
         });
         it('returns the fingerprint from existing session', async () => {
-            const [proteusService, { apiClient, coreCrypto }] = await (0, ProteusService_mocks_1.buildProteusService)();
+            const [proteusService, { apiClient, cryptoClient }] = await (0, ProteusService_mocks_1.buildProteusService)();
             const expectedFingerprint = 'fingerprint-client1';
             const getPrekeyMock = jest.spyOn(apiClient.api.user, 'getClientPreKey');
-            const sessionFromPrekeyMock = jest.spyOn(coreCrypto, 'proteusSessionFromPrekey');
-            jest.spyOn(coreCrypto, 'proteusFingerprintRemote').mockResolvedValue(expectedFingerprint);
-            jest.spyOn(coreCrypto, 'proteusSessionExists').mockResolvedValue(true);
+            const sessionFromPrekeyMock = jest.spyOn(cryptoClient, 'sessionFromPrekey');
+            jest.spyOn(cryptoClient, 'getRemoteFingerprint').mockResolvedValue(expectedFingerprint);
+            jest.spyOn(cryptoClient, 'sessionExists').mockResolvedValue(true);
             const userId = { id: 'user1', domain: 'domain.com' };
             const clientId = 'client1';
             const result = await proteusService.getRemoteFingerprint(userId, clientId);
@@ -188,9 +194,10 @@ describe('ProteusService', () => {
         };
         const decryptedMessage = {};
         it('decrypts incoming proteus encrypted events when session already exists', async () => {
-            const [proteusService, { coreCrypto }] = await (0, ProteusService_mocks_1.buildProteusService)();
-            jest.spyOn(coreCrypto, 'proteusSessionExists').mockResolvedValue(true);
-            const createSessionSpy = jest.spyOn(coreCrypto, 'proteusSessionFromMessage');
+            const [proteusService, { cryptoClient }] = await (0, ProteusService_mocks_1.buildProteusService)();
+            jest.spyOn(cryptoClient, 'sessionExists').mockResolvedValue(true);
+            const createSessionSpy = jest.spyOn(cryptoClient, 'sessionFromMessage');
+            jest.spyOn(cryptoClient, 'decrypt').mockResolvedValue(new Uint8Array());
             jest.spyOn(protocol_messaging_1.GenericMessage, 'decode').mockReturnValue(decryptedMessage);
             const result = await proteusService.handleEvent(eventPayload);
             expect(result).toBeDefined();
@@ -198,10 +205,11 @@ describe('ProteusService', () => {
             expect(result === null || result === void 0 ? void 0 : result.decryptedData).toBe(decryptedMessage);
         });
         it('decrypts incoming proteus encrypted and creates session if not already existing', async () => {
-            const [proteusService, { coreCrypto }] = await (0, ProteusService_mocks_1.buildProteusService)();
-            jest.spyOn(coreCrypto, 'proteusSessionExists').mockResolvedValue(false);
-            const createSessionSpy = jest.spyOn(coreCrypto, 'proteusSessionFromMessage');
-            const decryptSpy = jest.spyOn(coreCrypto, 'proteusDecrypt');
+            const [proteusService, { cryptoClient }] = await (0, ProteusService_mocks_1.buildProteusService)();
+            jest.spyOn(cryptoClient, 'sessionExists').mockResolvedValue(false);
+            jest.spyOn(cryptoClient, 'saveSession').mockResolvedValue(undefined);
+            const createSessionSpy = jest.spyOn(cryptoClient, 'sessionFromMessage').mockResolvedValue(new Uint8Array());
+            const decryptSpy = jest.spyOn(cryptoClient, 'decrypt');
             jest.spyOn(protocol_messaging_1.GenericMessage, 'decode').mockReturnValue(decryptedMessage);
             const result = await proteusService.handleEvent(eventPayload);
             expect(result).toBeDefined();
@@ -212,28 +220,18 @@ describe('ProteusService', () => {
     });
     describe('"encrypt"', () => {
         it('returns encrypted payload', async () => {
-            const { services, data: { firstUser, validPreKey, encryptedMessageBuffer, messageBuffer }, } = await prepareDataForEncryption(false);
+            const { services, data: { firstUser, encryptedMessageBuffer, messageBuffer }, } = await prepareDataForEncryption(false);
             const userClients = {
                 [firstUser.id]: [firstUser.clients.first, firstUser.clients.second],
             };
-            const preKeyBundleMap = {
-                [firstUser.id]: {
-                    [firstUser.clients.first]: validPreKey,
-                    [firstUser.clients.second]: validPreKey,
-                },
-            };
             const encryptedPayload = new Map([
                 [firstUser.sessions.first, encryptedMessageBuffer],
                 [firstUser.sessions.second, encryptedMessageBuffer],
             ]);
-            jest
-                .spyOn(services.apiClient.api.user, 'postMultiPreKeyBundles')
-                .mockImplementationOnce(() => Promise.resolve(preKeyBundleMap));
-            jest
-                .spyOn(services.coreCryptoClient, 'proteusEncryptBatched')
-                .mockImplementationOnce(() => Promise.resolve(encryptedPayload));
+            jest.spyOn(services.cryptoClient, 'sessionExists').mockResolvedValue(true);
+            jest.spyOn(services.cryptoClient, 'encrypt').mockImplementationOnce(() => Promise.resolve(encryptedPayload));
             const encrypted = await services.proteusService.encrypt(messageBuffer, userClients);
-            expect(services.coreCryptoClient.proteusEncryptBatched).toHaveBeenCalledWith([firstUser.sessions.first, firstUser.sessions.second], messageBuffer);
+            expect(services.cryptoClient.encrypt).toHaveBeenCalledWith([firstUser.sessions.first, firstUser.sessions.second], messageBuffer);
             expect(encrypted).toEqual({
                 [firstUser.id]: {
                     [firstUser.clients.first]: encryptedMessageBuffer,
@@ -242,33 +240,20 @@ describe('ProteusService', () => {
             });
         });
         it('returns encrypted payload for multiple users', async () => {
-            const { services, data: { firstUser, secondUser, validPreKey, encryptedMessageBuffer, messageBuffer }, } = await prepareDataForEncryption(false);
+            const { services, data: { firstUser, secondUser, encryptedMessageBuffer, messageBuffer }, } = await prepareDataForEncryption(false);
             const userClients = {
                 [firstUser.id]: [firstUser.clients.first, firstUser.clients.second],
                 [secondUser.id]: [secondUser.clients.first],
             };
-            const preKeyBundleMap = {
-                [firstUser.id]: {
-                    [firstUser.clients.first]: validPreKey,
-                    [firstUser.clients.second]: null,
-                },
-                [secondUser.id]: {
-                    [secondUser.clients.first]: validPreKey,
-                },
-            };
             const encryptedPayload = new Map([
                 [firstUser.sessions.first, encryptedMessageBuffer],
                 [firstUser.sessions.second, encryptedMessageBuffer],
                 [secondUser.sessions.first, encryptedMessageBuffer],
             ]);
-            jest
-                .spyOn(services.apiClient.api.user, 'postMultiPreKeyBundles')
-                .mockImplementationOnce(() => Promise.resolve(preKeyBundleMap));
-            jest
-                .spyOn(services.coreCryptoClient, 'proteusEncryptBatched')
-                .mockImplementationOnce(() => Promise.resolve(encryptedPayload));
+            jest.spyOn(services.cryptoClient, 'sessionExists').mockResolvedValue(true);
+            jest.spyOn(services.cryptoClient, 'encrypt').mockResolvedValueOnce(encryptedPayload);
             const encrypted = await services.proteusService.encrypt(messageBuffer, userClients);
-            expect(services.coreCryptoClient.proteusEncryptBatched).toHaveBeenCalledWith([firstUser.sessions.first, secondUser.sessions.first], messageBuffer);
+            expect(services.cryptoClient.encrypt).toHaveBeenCalledWith([firstUser.sessions.first, firstUser.sessions.second, secondUser.sessions.first], messageBuffer);
             expect(encrypted).toEqual({
                 [firstUser.id]: {
                     [firstUser.clients.first]: encryptedMessageBuffer,
@@ -282,33 +267,21 @@ describe('ProteusService', () => {
     });
     describe('"encryptQualified"', () => {
         it('returns encrypted payload', async () => {
-            const { services, data: { firstUser, validPreKey, encryptedMessageBuffer, messageBuffer, domain }, } = await prepareDataForEncryption();
+            const { services, data: { firstUser, encryptedMessageBuffer, messageBuffer, domain }, } = await prepareDataForEncryption();
             const userClients = {
                 [domain]: {
                     [firstUser.id]: [firstUser.clients.first, firstUser.clients.second],
                 },
             };
-            const preKeyBundleMap = {
-                [domain]: {
-                    [firstUser.id]: {
-                        [firstUser.clients.first]: validPreKey,
-                        [firstUser.clients.second]: validPreKey,
-                    },
-                },
-            };
             const encryptedPayload = new Map([
                 [firstUser.sessions.first, encryptedMessageBuffer],
                 [firstUser.sessions.second, encryptedMessageBuffer],
             ]);
-            jest
-                .spyOn(services.apiClient.api.user, 'postQualifiedMultiPreKeyBundles')
-                .mockImplementationOnce(() => Promise.resolve(preKeyBundleMap));
-            jest
-                .spyOn(services.coreCryptoClient, 'proteusEncryptBatched')
-                .mockImplementationOnce(() => Promise.resolve(encryptedPayload));
+            jest.spyOn(services.cryptoClient, 'sessionExists').mockResolvedValue(true);
+            jest.spyOn(services.cryptoClient, 'encrypt').mockResolvedValueOnce(encryptedPayload);
             const encrypted = await services.proteusService.encryptQualified(messageBuffer, userClients);
             // console.log({encrypted, missing});
-            expect(services.coreCryptoClient.proteusEncryptBatched).toHaveBeenCalledWith([firstUser.sessions.first, firstUser.sessions.second], messageBuffer);
+            expect(services.cryptoClient.encrypt).toHaveBeenCalledWith([firstUser.sessions.first, firstUser.sessions.second], messageBuffer);
             expect(encrypted).toEqual({
                 [domain]: {
                     [firstUser.id]: {
@@ -319,40 +292,27 @@ describe('ProteusService', () => {
             });
         });
         it('returns missing clients and encrypted payload for multiple users', async () => {
-            const { services, data: { firstUser, secondUser, validPreKey, encryptedMessageBuffer, messageBuffer, domain }, } = await prepareDataForEncryption();
+            const { services, data: { firstUser, secondUser, encryptedMessageBuffer, messageBuffer, domain }, } = await prepareDataForEncryption();
             const userClients = {
                 [domain]: {
                     [firstUser.id]: [firstUser.clients.first, firstUser.clients.second],
                     [secondUser.id]: [secondUser.clients.first],
                 },
             };
-            const preKeyBundleMap = {
-                [domain]: {
-                    [firstUser.id]: {
-                        [firstUser.clients.first]: validPreKey,
-                        [firstUser.clients.second]: null,
-                    },
-                    [secondUser.id]: {
-                        [secondUser.clients.first]: validPreKey,
-                    },
-                },
-            };
             const encryptedPayload = new Map([
                 [firstUser.sessions.first, encryptedMessageBuffer],
+                [firstUser.sessions.second, encryptedMessageBuffer],
                 [secondUser.sessions.first, encryptedMessageBuffer],
             ]);
-            jest
-                .spyOn(services.apiClient.api.user, 'postQualifiedMultiPreKeyBundles')
-                .mockImplementationOnce(() => Promise.resolve(preKeyBundleMap));
-            jest
-                .spyOn(services.coreCryptoClient, 'proteusEncryptBatched')
-                .mockImplementationOnce(() => Promise.resolve(encryptedPayload));
+            jest.spyOn(services.cryptoClient, 'sessionExists').mockResolvedValue(true);
+            jest.spyOn(services.cryptoClient, 'encrypt').mockResolvedValueOnce(encryptedPayload);
             const encrypted = await services.proteusService.encryptQualified(messageBuffer, userClients);
-            expect(services.coreCryptoClient.proteusEncryptBatched).toHaveBeenCalledWith([firstUser.sessions.first, secondUser.sessions.first], messageBuffer);
+            expect(services.cryptoClient.encrypt).toHaveBeenCalledWith([firstUser.sessions.first, firstUser.sessions.second, secondUser.sessions.first], messageBuffer);
             expect(encrypted).toEqual({
                 [domain]: {
                     [firstUser.id]: {
                         [firstUser.clients.first]: encryptedMessageBuffer,
+                        [firstUser.clients.second]: encryptedMessageBuffer,
                     },
                     [secondUser.id]: {
                         [secondUser.clients.first]: encryptedMessageBuffer,

package/lib/messagingProtocols/proteus/Utility/SessionHandler/SessionHandler.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"SessionHandler.d.ts","sourceRoot":"","sources":["../../../../../src/messagingProtocols/proteus/Utility/SessionHandler/SessionHandler.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,MAAM,EAAC,MAAM,8BAA8B,CAAC;AACpD,OAAO,EAAC,WAAW,EAAC,MAAM,sCAAsC,CAAC;AACjE,OAAO,EAAC,WAAW,EAAE,mBAAmB,EAAC,MAAM,8BAA8B,CAAC;AAE9E,OAAO,EAAC,MAAM,EAAC,MAAM,SAAS,CAAC;AAE/B,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAK9C,OAAO,EAAC,YAAY,EAAC,MAAM,mCAAmC,CAAC;AAE/D,UAAU,wBAAwB;IAChC,MAAM,EAAE,MAAM,GAAG,WAAW,CAAC;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,OAAO,CAAC;IACzB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,QAAA,MAAM,kBAAkB,kDAAiD,wBAAwB,KAAG,MAKnG,CAAC;~~AA2GF~~;;;GAGG;AACH,QAAA,MAAM,WAAW;YAC6B,WAAW;cAAY,MAAM;;;eAClC,SAAS;kBAAgB,YAAY;MAC3E,QAAQ,MAAM,~~CAYhB~~,CAAC;AAyBF,UAAU,wCAAwC;IAChD,UAAU,EAAE,WAAW,GAAG,mBAAmB,CAAC;IAC9C,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,SAAS,CAAC;IACrB,YAAY,EAAE,YAAY,CAAC;IAC3B,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,QAAA,MAAM,YAAY,6DAMf,wCAAwC,KAAG,QAAQ,MAAM,EAAE,CAgC7D,CAAC;AAEF,UAAU,mBAAmB;IAC3B,MAAM,EAAE,WAAW,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,YAAY,CAAC;IAC3B,eAAe,EAAE,OAAO,CAAC;CAC1B;AACD,iBAAe,aAAa,CAAC,MAAM,EAAE,mBAAmB,iBAGvD;AA+CD,KAAK,iBAAiB,CAAC,CAAC,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC;AAC9D;;GAEG;AACH,QAAA,MAAM,sBAAsB,uDAO3B,CAAC;AAEF,OAAO,EAAC,kBAAkB,EAAE,WAAW,EAAE,YAAY,EAAE,aAAa,EAAE,sBAAsB,EAAC,CAAC"}
1	+ {"version":3,"file":"SessionHandler.d.ts","sourceRoot":"","sources":["../../../../../src/messagingProtocols/proteus/Utility/SessionHandler/SessionHandler.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,MAAM,EAAC,MAAM,8BAA8B,CAAC;AACpD,OAAO,EAAC,WAAW,EAAC,MAAM,sCAAsC,CAAC;AACjE,OAAO,EAAC,WAAW,EAAE,mBAAmB,EAAC,MAAM,8BAA8B,CAAC;AAE9E,OAAO,EAAC,MAAM,EAAC,MAAM,SAAS,CAAC;AAE/B,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAK9C,OAAO,EAAC,YAAY,EAAC,MAAM,mCAAmC,CAAC;AAE/D,UAAU,wBAAwB;IAChC,MAAM,EAAE,MAAM,GAAG,WAAW,CAAC;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,OAAO,CAAC;IACzB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,QAAA,MAAM,kBAAkB,kDAAiD,wBAAwB,KAAG,MAKnG,CAAC;AAuFF;;;GAGG;AACH,QAAA,MAAM,WAAW;YAC6B,WAAW;cAAY,MAAM;;;eAClC,SAAS;kBAAgB,YAAY;MAC3E,QAAQ,MAAM,CAmBhB,CAAC;AAyBF,UAAU,wCAAwC;IAChD,UAAU,EAAE,WAAW,GAAG,mBAAmB,CAAC;IAC9C,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,SAAS,CAAC;IACrB,YAAY,EAAE,YAAY,CAAC;IAC3B,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,QAAA,MAAM,YAAY,6DAMf,wCAAwC,KAAG,QAAQ,MAAM,EAAE,CAgC7D,CAAC;AAEF,UAAU,mBAAmB;IAC3B,MAAM,EAAE,WAAW,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,YAAY,CAAC;IAC3B,eAAe,EAAE,OAAO,CAAC;CAC1B;AACD,iBAAe,aAAa,CAAC,MAAM,EAAE,mBAAmB,iBAGvD;AA+CD,KAAK,iBAAiB,CAAC,CAAC,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC;AAC9D;;GAEG;AACH,QAAA,MAAM,sBAAsB,uDAO3B,CAAC;AAEF,OAAO,EAAC,kBAAkB,EAAE,WAAW,EAAE,YAAY,EAAE,aAAa,EAAE,sBAAsB,EAAC,CAAC"}

package/lib/messagingProtocols/proteus/Utility/SessionHandler/SessionHandler.js CHANGED Viewed

@@ -43,13 +43,6 @@ const parseSessionId = (sessionId) => {
     }
     return match.groups;
 };
-const createSession = async ({ sessionId, initialPrekey, cryptoClient, apiClient, }) => {
-    const { userId, clientId, domain } = parseSessionId(sessionId);
-    const prekey = initialPrekey !== null && initialPrekey !== void 0 ? initialPrekey : (await apiClient.api.user.getClientPreKey({ id: userId, domain: domain !== null && domain !== void 0 ? domain : '' }, clientId)).prekey;
-    const prekeyBuffer = bazinga64_1.Decoder.fromBase64(prekey.key).asBytes;
-    await cryptoClient.sessionFromPrekey(sessionId, prekeyBuffer);
-    await cryptoClient.saveSession(sessionId);
-};
 const createLegacySessions = async ({ userClients, apiClient, cryptoClient, logger, }) => {
     const preKeyBundleMap = await apiClient.api.user.postMultiPreKeyBundles(userClients);
     const sessions = await createSessionsFromPreKeys({
@@ -87,15 +80,22 @@ const createQualifiedSessions = async ({ userClientMap, domain, apiClient, crypt
 const initSession = async ({ userId, clientId, initialPrekey }, { cryptoClient, apiClient }) => {
     const sessionId = constructSessionId({ userId, clientId, useQualifiedIds: !!userId.domain });
     const sessionExists = await cryptoClient.sessionExists(sessionId);
-    if (!sessionExists) {
-        await createSession({
-            sessionId,
-            initialPrekey,
-            apiClient: apiClient,
-            cryptoClient,
-        });
+    if (sessionExists) {
+        return sessionId;
+    }
+    if (initialPrekey) {
+        const prekeyBuffer = bazinga64_1.Decoder.fromBase64(initialPrekey.key).asBytes;
+        await cryptoClient.sessionFromPrekey(sessionId, prekeyBuffer);
+        await cryptoClient.saveSession(sessionId);
+        return sessionId;
     }
-    return sessionId;
+    const sessions = await initSessions({
+        recipients: { [userId.id]: [clientId] },
+        domain: userId.domain,
+        apiClient,
+        cryptoClient,
+    });
+    return sessions[0];
 };
 exports.initSession = initSession;
 /**

package/lib/messagingProtocols/proteus/Utility/SessionHandler/SessionHandler.test.js CHANGED Viewed

@@ -18,10 +18,28 @@
  *
  */
 Object.defineProperty(exports, "__esModule", { value: true });
+const api_client_1 = require("@wireapp/api-client");
 const SessionHandler_1 = require("./SessionHandler");
-const CoreCryptoWrapper_1 = require("../../ProteusService/CryptoClient/CoreCryptoWrapper");
-const ProteusService_mocks_1 = require("../../ProteusService/ProteusService.mocks");
+function generatePrekeys(userId, clientIds) {
+    const clients = clientIds.reduce((prekeys, clientId, index) => {
+        return Object.assign(Object.assign({}, prekeys), { [clientId]: {
+                id: index,
+                key: 'pQABARn//wKhAFggJ1Fbpg5l6wnzKOJE+vXpRnkqUYhIvVnR5lNXEbO2o/0DoQChAFggHxZvgvtDktY/vqBcpjjo6rQnXvcNQhfwmy8AJQJKlD0E9g==',
+            } });
+    }, {});
+    return {
+        [userId.id]: Object.assign({}, clients),
+    };
+}
 describe('SessionHandler', () => {
+    const cryptoClient = {
+        sessionFromMessage: jest.fn(),
+        sessionFromPrekey: jest.fn(),
+        sessionExists: jest.fn(),
+        saveSession: jest.fn(),
+        deleteSession: jest.fn(),
+    };
+    const apiClient = new api_client_1.APIClient({ urls: api_client_1.APIClient.BACKEND.STAGING });
     describe('constructSessionId', () => {
         describe('constructs a session ID', () => {
             it('without a domain', () => {
@@ -66,35 +84,42 @@ describe('SessionHandler', () => {
     });
     describe('initSession', () => {
         it('only returns sessions that already exists', async () => {
-            const { apiClient, coreCrypto } = (await (0, ProteusService_mocks_1.buildProteusService)())[1];
-            jest.spyOn(coreCrypto, 'proteusSessionExists').mockResolvedValue(true);
-            const sessionFromPrekeySpy = jest.spyOn(coreCrypto, 'proteusSessionFromPrekey');
-            await (0, SessionHandler_1.initSession)({ userId: { id: 'user1', domain: 'domain' }, clientId: 'client1' }, { apiClient, cryptoClient: new CoreCryptoWrapper_1.CoreCryptoWrapper(coreCrypto, {}, {}) });
-            expect(sessionFromPrekeySpy).not.toHaveBeenCalled();
+            jest.spyOn(cryptoClient, 'sessionExists').mockResolvedValue(true);
+            await (0, SessionHandler_1.initSession)({ userId: { id: 'user1', domain: 'domain' }, clientId: 'client1' }, { apiClient, cryptoClient });
+            expect(cryptoClient.sessionFromPrekey).not.toHaveBeenCalled();
         });
         it('creates the session if it does not already exist', async () => {
-            const { apiClient, coreCrypto } = (await (0, ProteusService_mocks_1.buildProteusService)())[1];
-            jest.spyOn(coreCrypto, 'proteusSessionExists').mockResolvedValue(false);
-            jest.spyOn(apiClient.api.user, 'getClientPreKey').mockResolvedValue({
-                prekey: {
-                    id: 1,
-                    key: 'pQABARn//wKhAFggJ1Fbpg5l6wnzKOJE+vXpRnkqUYhIvVnR5lNXEbO2o/0DoQChAFggHxZvgvtDktY/vqBcpjjo6rQnXvcNQhfwmy8AJQJKlD0E9g==',
-                },
-                client: 'client1',
+            const userId = { id: 'user1', domain: 'domain' };
+            const clientId = 'client1';
+            jest.spyOn(cryptoClient, 'sessionExists').mockResolvedValue(false);
+            jest
+                .spyOn(apiClient.api.user, 'postQualifiedMultiPreKeyBundles')
+                .mockResolvedValue({ domain: generatePrekeys(userId, [clientId]) });
+            const sessionId = (0, SessionHandler_1.constructSessionId)({
+                userId,
+                clientId,
+                useQualifiedIds: true,
             });
+            await (0, SessionHandler_1.initSession)({ userId, clientId }, { apiClient, cryptoClient });
+            expect(cryptoClient.sessionFromPrekey).toHaveBeenCalledWith(sessionId, expect.any(Object));
+        });
+        it('indicates the consumer if a session could not be created', async () => {
+            const userId = { id: 'user1', domain: 'domain' };
+            const clientId = 'client1';
+            jest
+                .spyOn(apiClient.api.user, 'postQualifiedMultiPreKeyBundles')
+                .mockResolvedValue({ domain: generatePrekeys(userId, [clientId]) });
             const sessionId = (0, SessionHandler_1.constructSessionId)({
-                userId: { id: 'user1', domain: 'domain' },
-                clientId: 'client1',
+                userId,
+                clientId,
                 useQualifiedIds: true,
             });
-            const sessionFromPrekeySpy = jest.spyOn(coreCrypto, 'proteusSessionFromPrekey');
-            await (0, SessionHandler_1.initSession)({ userId: { id: 'user1', domain: 'domain' }, clientId: 'client1' }, { apiClient, cryptoClient: new CoreCryptoWrapper_1.CoreCryptoWrapper(coreCrypto, {}, {}) });
-            expect(sessionFromPrekeySpy).toHaveBeenCalledWith(sessionId, expect.any(Object));
+            await (0, SessionHandler_1.initSession)({ userId, clientId }, { apiClient, cryptoClient });
+            expect(cryptoClient.sessionFromPrekey).toHaveBeenCalledWith(sessionId, expect.any(Object));
         });
     });
     describe('initSessions', () => {
         it('creates new sessions only for sessions that are missing', async () => {
-            const { apiClient, coreCrypto } = (await (0, ProteusService_mocks_1.buildProteusService)())[1];
             const existingUserClients = {
                 'existing-user1': ['client1'],
                 'existing-user2': ['client1', 'client2'],
@@ -104,32 +129,15 @@ describe('SessionHandler', () => {
                 'missing-user2': ['client1', 'client2'],
             };
             jest.spyOn(apiClient.api.user, 'postQualifiedMultiPreKeyBundles').mockResolvedValue({});
-            jest.spyOn(apiClient.api.user, 'postMultiPreKeyBundles').mockResolvedValue({
-                'missing-user1': {
-                    client1: {
-                        id: 1,
-                        key: 'pQABARn//wKhAFggJ1Fbpg5l6wnzKOJE+vXpRnkqUYhIvVnR5lNXEbO2o/0DoQChAFggHxZvgvtDktY/vqBcpjjo6rQnXvcNQhfwmy8AJQJKlD0E9g==',
-                    },
-                },
-                'missing-user2': {
-                    client1: {
-                        id: 1,
-                        key: 'pQABARn//wKhAFggJ1Fbpg5l6wnzKOJE+vXpRnkqUYhIvVnR5lNXEbO2o/0DoQChAFggHxZvgvtDktY/vqBcpjjo6rQnXvcNQhfwmy8AJQJKlD0E9g==',
-                    },
-                    client2: {
-                        id: 1,
-                        key: 'pQABARn//wKhAFggJ1Fbpg5l6wnzKOJE+vXpRnkqUYhIvVnR5lNXEbO2o/0DoQChAFggHxZvgvtDktY/vqBcpjjo6rQnXvcNQhfwmy8AJQJKlD0E9g==',
-                    },
-                },
-            });
+            jest.spyOn(apiClient.api.user, 'postMultiPreKeyBundles').mockResolvedValue(Object.assign(Object.assign({}, generatePrekeys({ id: 'missing-user1', domain: '' }, ['client1'])), generatePrekeys({ id: 'missing-user2', domain: '' }, ['client1', 'client2'])));
             jest
-                .spyOn(coreCrypto, 'proteusSessionExists')
+                .spyOn(cryptoClient, 'sessionExists')
                 .mockImplementation(sessionId => Promise.resolve(sessionId.includes('missing')));
-            const sessionFromPrekeySpy = jest.spyOn(coreCrypto, 'proteusSessionFromPrekey');
+            const sessionFromPrekeySpy = jest.spyOn(cryptoClient, 'sessionFromPrekey');
             const sessions = await (0, SessionHandler_1.initSessions)({
                 recipients: Object.assign(Object.assign({}, existingUserClients), missingUserClients),
                 apiClient,
-                cryptoClient: new CoreCryptoWrapper_1.CoreCryptoWrapper(coreCrypto, {}, {}),
+                cryptoClient,
             });
             expect(sessionFromPrekeySpy).toHaveBeenCalledTimes(3);
             expect(sessions).toHaveLength(6);

package/lib/util/fullyQualifiedClientIdUtils.d.ts CHANGED Viewed

@@ -9,6 +9,6 @@ export declare const parseFullQualifiedClientId: (qualifiedId: string) => {
     client: ClientId;
     domain: Domain;
 };
-export declare const mapQualifiedUserClientIdsToFullyQualifiedClientIds: (qualifiedUserMap: QualifiedUserClientMap) => Uint8Array[];
+export declare const mapQualifiedUserClientIdsToFullyQualifiedClientIds: (qualifiedUserMap: QualifiedUserClientMap) => `${string}:${string}@${string}`[];
 export {};
 //# sourceMappingURL=fullyQualifiedClientIdUtils.d.ts.map

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

	@@ -1 +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,~~iBAQ1G~~,CAAC"}
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"}

package/lib/util/fullyQualifiedClientIdUtils.js CHANGED Viewed

@@ -32,10 +32,9 @@ const parseFullQualifiedClientId = (qualifiedId) => {
 };
 exports.parseFullQualifiedClientId = parseFullQualifiedClientId;
 const mapQualifiedUserClientIdsToFullyQualifiedClientIds = (qualifiedUserMap) => {
-    const encoder = new TextEncoder();
     return Object.entries(qualifiedUserMap).flatMap(([domain, users]) => {
         const clients = Object.entries(users);
-        return clients.flatMap(([userId, clients]) => clients.map(client => encoder.encode((0, exports.constructFullyQualifiedClientId)(userId, client.id, domain))));
+        return clients.flatMap(([userId, clients]) => clients.map(client => (0, exports.constructFullyQualifiedClientId)(userId, client.id, domain)));
     });
 };
 exports.mapQualifiedUserClientIdsToFullyQualifiedClientIds = mapQualifiedUserClientIdsToFullyQualifiedClientIds;

package/lib/util/fullyQualifiedClientIdUtils.test.js CHANGED Viewed

@@ -36,7 +36,6 @@ var MOCKED_CLIENT_IDS;
     MOCKED_CLIENT_IDS["CLIENT2"] = "4130002c222";
     MOCKED_CLIENT_IDS["CLIENT3"] = "4130002c223";
 })(MOCKED_CLIENT_IDS || (MOCKED_CLIENT_IDS = {}));
-const encoder = new TextEncoder();
 describe('constructFullyQualifiedClientId', () => {
     it('construct fullyQualifiedClientId client id', () => {
         expect((0, fullyQualifiedClientIdUtils_1.constructFullyQualifiedClientId)(MOCKED_USER_IDS.USER1, MOCKED_CLIENT_IDS.CLIENT1, MOCKED_DOMAINS.DOMAIN1)).toEqual(`${MOCKED_USER_IDS.USER1}:${MOCKED_CLIENT_IDS.CLIENT1}@${MOCKED_DOMAINS.DOMAIN1}`);
@@ -67,7 +66,7 @@ describe('mapQualifiedUserClientIdsToFullyQualifiedClientIds', () => {
                 ],
             },
         };
-        const expectedResult = [`${MOCKED_USER_IDS.USER1}:${MOCKED_CLIENT_IDS.CLIENT1}@${MOCKED_DOMAINS.DOMAIN1}`].map(x => encoder.encode(x));
+        const expectedResult = [`${MOCKED_USER_IDS.USER1}:${MOCKED_CLIENT_IDS.CLIENT1}@${MOCKED_DOMAINS.DOMAIN1}`];
         const result = (0, fullyQualifiedClientIdUtils_1.mapQualifiedUserClientIdsToFullyQualifiedClientIds)(qualified_user_map3);
         expect(result).toEqual(expectedResult);
     });
@@ -98,7 +97,7 @@ describe('mapQualifiedUserClientIdsToFullyQualifiedClientIds', () => {
             `${MOCKED_USER_IDS.USER1}:${MOCKED_CLIENT_IDS.CLIENT1}@${MOCKED_DOMAINS.DOMAIN1}`,
             `${MOCKED_USER_IDS.USER1}:${MOCKED_CLIENT_IDS.CLIENT2}@${MOCKED_DOMAINS.DOMAIN2}`,
             `${MOCKED_USER_IDS.USER1}:${MOCKED_CLIENT_IDS.CLIENT3}@${MOCKED_DOMAINS.DOMAIN2}`,
-        ].map(x => encoder.encode(x));
+        ];
         const result = (0, fullyQualifiedClientIdUtils_1.mapQualifiedUserClientIdsToFullyQualifiedClientIds)(qualified_user_map3);
         expect(result).toEqual(expectedResult);
     });
@@ -143,7 +142,7 @@ describe('mapQualifiedUserClientIdsToFullyQualifiedClientIds', () => {
             `${MOCKED_USER_IDS.USER1}:${MOCKED_CLIENT_IDS.CLIENT2}@${MOCKED_DOMAINS.DOMAIN2}`,
             `${MOCKED_USER_IDS.USER1}:${MOCKED_CLIENT_IDS.CLIENT3}@${MOCKED_DOMAINS.DOMAIN2}`,
             `${MOCKED_USER_IDS.USER2}:${MOCKED_CLIENT_IDS.CLIENT2}@${MOCKED_DOMAINS.DOMAIN2}`,
-        ].map(x => encoder.encode(x));
+        ];
         const result = (0, fullyQualifiedClientIdUtils_1.mapQualifiedUserClientIdsToFullyQualifiedClientIds)(qualified_user_map3);
         expect(result).toEqual(expectedResult);
     });

package/package.json CHANGED Viewed

@@ -11,7 +11,7 @@
     "./lib/cryptography/AssetCryptography/crypto.node": "./lib/cryptography/AssetCryptography/crypto.browser.js"
   },
   "dependencies": {
-    "@wireapp/api-client": "^22.15.0",
+    "@wireapp/api-client": "^22.15.1",
     "@wireapp/commons": "^5.0.4",
     "@wireapp/core-crypto": "0.6.0-rc.3",
     "@wireapp/cryptobox": "12.8.0",
@@ -19,7 +19,7 @@
     "@wireapp/protocol-messaging": "1.44.0",
     "@wireapp/store-engine": "5.0.3",
     "@wireapp/store-engine-dexie": "^2.0.5",
-    "axios": "1.2.6",
+    "axios": "1.3.0",
     "bazinga64": "6.0.3",
     "hash.js": "1.1.7",
     "http-status-codes": "2.2.0",
@@ -60,6 +60,6 @@
     "test:coverage": "jest --coverage",
     "watch": "tsc --watch"
   },
-  "version": "38.8.1",
-  "gitHead": "7db774faf6be1fa96f642fa167710fcb8aea70f1"
+  "version": "38.8.3",
+  "gitHead": "b37fb8e63a6d258cf0aed3be478fc5411f9bd6fe"
 }