@wireapp/core 38.14.1 → 38.14.3

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

@@ -154,9 +154,9 @@ describe('ProteusService', () => {
         it('create a session from given prekey if session does not exists', async () => {
             const [proteusService, { apiClient, cryptoClient }] = await (0, ProteusService_mocks_1.buildProteusService)();
             const expectedFingerprint = 'fingerprint-client1';
-            const getPrekeyMock = jest.spyOn(apiClient.api.user, 'getClientPreKey');
+            const getPrekeysSpy = jest.spyOn(apiClient.api.user, 'postQualifiedMultiPreKeyBundles');
             jest.spyOn(cryptoClient, 'getRemoteFingerprint').mockResolvedValue(expectedFingerprint);
-            jest.spyOn(cryptoClient, 'sessionFromPrekey').mockResolvedValue(undefined);
+            const saveSessionSpy = 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' };
@@ -165,7 +165,8 @@ describe('ProteusService', () => {
                 key: 'pQABARhIAqEAWCCaJpFa9c626ORmjj1aV6OnOYgmTjfoiE3ynOfNfGAOmgOhAKEAWCD60VMzRrLfO+1GSjgyhnVp2N7L58DM+eeJhZJi1tBLfQT2',
                 id: 123,
             });
-            expect(getPrekeyMock).not.toHaveBeenCalled();
+            expect(saveSessionSpy).toHaveBeenCalled();
+            expect(getPrekeysSpy).not.toHaveBeenCalled();
             expect(result).toBe(expectedFingerprint);
         });
         it('returns the fingerprint from existing session', async () => {

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

@@ -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;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"}
+{"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,CAShB,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,CA+C7D,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

@@ -78,19 +78,9 @@ const createQualifiedSessions = async ({ userClientMap, domain, apiClient, crypt
  * @param sessionId the session to init
  */
 const initSession = async ({ userId, clientId, initialPrekey }, { cryptoClient, apiClient }) => {
-    const sessionId = constructSessionId({ userId, clientId, useQualifiedIds: !!userId.domain });
-    const sessionExists = await cryptoClient.sessionExists(sessionId);
-    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;
-    }
+    const recipients = initialPrekey ? { [userId.id]: { [clientId]: initialPrekey } } : { [userId.id]: [clientId] };
     const sessions = await initSessions({
-        recipients: { [userId.id]: [clientId] },
+        recipients,
         domain: userId.domain,
         apiClient,
         cryptoClient,
@@ -118,7 +108,8 @@ const createSessions = async ({ userClientMap, domain, apiClient, cryptoClient,
  * Will make sure all the sessions need to encrypt for those user/clients pair are set
  */
 const initSessions = async ({ recipients, domain = '', apiClient, cryptoClient, logger, }) => {
-    const missingUserClients = {};
+    const missingClients = {};
+    const missingClientsWithPrekeys = {};
     const existingSessions = [];
     const users = (0, UserClientsUtil_1.flattenUserClients)(recipients, domain);
     for (const user of users) {
@@ -130,21 +121,33 @@ const initSessions = async ({ recipients, domain = '', apiClient, cryptoClient,
                 existingSessions.push(sessionId);
                 continue;
             }
-            missingUserClients[userId.id] = missingUserClients[userId.id] || [];
-            missingUserClients[userId.id].push(clientId);
+            if (!Array.isArray(data)) {
+                missingClientsWithPrekeys[userId.id] = missingClientsWithPrekeys[userId.id] || {};
+                missingClientsWithPrekeys[userId.id][clientId] = data[clientId];
+                continue;
+            }
+            missingClients[userId.id] = missingClients[userId.id] || [];
+            missingClients[userId.id].push(clientId);
         }
     }
-    if (Object.keys(missingUserClients).length === 0) {
-        return existingSessions;
-    }
-    const newSessions = await createSessions({
-        userClientMap: missingUserClients,
-        domain,
-        apiClient,
-        cryptoClient,
-        logger,
-    });
-    return [...existingSessions, ...newSessions];
+    const newPrekeySessions = Object.keys(missingClientsWithPrekeys).length > 0
+        ? await createSessionsFromPreKeys({
+            preKeyBundleMap: missingClientsWithPrekeys,
+            domain,
+            useQualifiedIds: !!domain,
+            cryptoClient,
+        })
+        : [];
+    const newSessions = Object.keys(missingClients).length > 0
+        ? await createSessions({
+            userClientMap: missingClients,
+            domain,
+            apiClient,
+            cryptoClient,
+            logger,
+        })
+        : [];
+    return [...existingSessions, ...newPrekeySessions, ...newSessions];
 };
 exports.initSessions = initSessions;
 async function deleteSession(params) {

package/package.json

@@ -11,7 +11,7 @@
     "./lib/cryptography/AssetCryptography/crypto.node": "./lib/cryptography/AssetCryptography/crypto.browser.js"
   },
   "dependencies": {
-    "@wireapp/api-client": "^22.15.6",
+    "@wireapp/api-client": "^22.16.0",
     "@wireapp/commons": "^5.0.4",
     "@wireapp/core-crypto": "0.6.2",
     "@wireapp/cryptobox": "12.8.0",
@@ -60,6 +60,6 @@
     "test:coverage": "jest --coverage",
     "watch": "tsc --watch"
   },
-  "version": "38.14.1",
-  "gitHead": "4a09446df4dc6b37d809ddb623fc3c796b17db48"
+  "version": "38.14.3",
+  "gitHead": "abc28cc952a2154ede6ba475b7ccc780b7f3b20d"
 }