@wireapp/core 39.0.1 → 39.0.2

package/lib/conversation/message/MessageService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MessageService.d.ts","sourceRoot":"","sources":["../../../src/conversation/message/MessageService.ts"],"names":[],"mappings":"AAmBA,OAAO,EAEL,oBAAoB,EAEpB,oBAAoB,EACrB,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAC,WAAW,EAAE,4BAA4B,EAAC,MAAM,8BAA8B,CAAC;AAOvF,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAI9C,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,kCAAkC,CAAC;AAKrE,qBAAa,cAAc;IACb,OAAO,CAAC,QAAQ,CAAC,SAAS;IAAa,OAAO,CAAC,QAAQ,CAAC,cAAc;gBAArD,SAAS,EAAE,SAAS,EAAmB,cAAc,EAAE,cAAc;IAElG;;;;;;;;;;;OAWG;IACU,WAAW,CACtB,eAAe,EAAE,MAAM,EACvB,UAAU,EAAE,oBAAoB,GAAG,4BAA4B,EAC/D,SAAS,EAAE,UAAU,EACrB,OAAO,GAAE;QACP,SAAS,CAAC,EAAE,UAAU,CAAC;QACvB,cAAc,CAAC,EAAE,WAAW,CAAC;QAC7B,aAAa,CAAC,EAAE,OAAO,GAAG,WAAW,EAAE,CAAC;QACxC,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,gBAAgB,CAAC,EAAE,CAAC,QAAQ,EAAE,oBAAoB,KAAK,IAAI,GAAG,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;KACrF,GACL,OAAO,CAAC,oBAAoB,GAAG;QAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;KAAC,CAAC;YAwBzC,cAAc;IAiE5B,OAAO,CAAC,qBAAqB;IAI7B;;;;;;;OAOG;YACW,sBAAsB;CAoBrC"}
+{"version":3,"file":"MessageService.d.ts","sourceRoot":"","sources":["../../../src/conversation/message/MessageService.ts"],"names":[],"mappings":"AAmBA,OAAO,EAEL,oBAAoB,EAEpB,oBAAoB,EACrB,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAC,WAAW,EAAE,4BAA4B,EAAC,MAAM,8BAA8B,CAAC;AAOvF,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAI9C,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,kCAAkC,CAAC;AAKrE,qBAAa,cAAc;IACb,OAAO,CAAC,QAAQ,CAAC,SAAS;IAAa,OAAO,CAAC,QAAQ,CAAC,cAAc;gBAArD,SAAS,EAAE,SAAS,EAAmB,cAAc,EAAE,cAAc;IAElG;;;;;;;;;;;OAWG;IACU,WAAW,CACtB,eAAe,EAAE,MAAM,EACvB,UAAU,EAAE,oBAAoB,GAAG,4BAA4B,EAC/D,SAAS,EAAE,UAAU,EACrB,OAAO,GAAE;QACP,SAAS,CAAC,EAAE,UAAU,CAAC;QACvB,cAAc,CAAC,EAAE,WAAW,CAAC;QAC7B,aAAa,CAAC,EAAE,OAAO,GAAG,WAAW,EAAE,CAAC;QACxC,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,gBAAgB,CAAC,EAAE,CAAC,QAAQ,EAAE,oBAAoB,KAAK,IAAI,GAAG,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;KACrF,GACL,OAAO,CAAC,oBAAoB,GAAG;QAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;KAAC,CAAC;YAwBzC,cAAc;IAiE5B,OAAO,CAAC,qBAAqB;IAI7B;;;;;;;OAOG;YACW,sBAAsB;CAsBrC"}

package/lib/conversation/message/MessageService.js

@@ -133,7 +133,12 @@ class MessageService {
         if (Object.keys(mismatch.missing).length) {
             const { payloads } = await this.proteusService.encrypt(plainText, mismatch.missing);
             const reEncryptedPayloads = (0, UserClientsUtil_1.flattenQualifiedUserClients)(payloads);
-            reEncryptedPayloads.forEach(({ data, userId }) => (recipients[userId.domain][userId.id] = Object.assign(Object.assign({}, recipients[userId.domain][userId.id]), data)));
+            reEncryptedPayloads.forEach(({ data, userId }) => {
+                var _a;
+                const domainRecipients = (_a = recipients[userId.domain]) !== null && _a !== void 0 ? _a : {};
+                domainRecipients[userId.id] = Object.assign(Object.assign({}, domainRecipients[userId.id]), data);
+                recipients[userId.domain] = domainRecipients;
+            });
         }
         return recipients;
     }

package/lib/conversation/message/MessageService.test.js

@@ -134,6 +134,30 @@ describe('MessageService', () => {
                 failed_to_send: {},
                 time: new Date().toISOString(),
             };
+            it('handles client mismatch when no other clients from that domain are known', async () => {
+                const [messageService, { apiClient }] = await buildMessageService();
+                let spyCounter = 0;
+                const clientMismatch = Object.assign(Object.assign({}, baseClientMismatch), { missing: { [user1.domain]: { [user1.id]: ['client'] } } });
+                jest.spyOn(apiClient.api.conversation, 'postOTRMessage').mockImplementation(() => {
+                    spyCounter++;
+                    if (spyCounter === 1) {
+                        const error = new Error();
+                        error.response = {
+                            status: http_status_codes_1.StatusCodes.PRECONDITION_FAILED,
+                            data: clientMismatch,
+                        };
+                        return Promise.reject(error);
+                    }
+                    return Promise.resolve(baseClientMismatch);
+                });
+                jest.spyOn(apiClient.api.user, 'postMultiPreKeyBundles').mockReturnValue(Promise.resolve({}));
+                const recipients = generateRecipients([]);
+                await messageService.sendMessage('senderclientid', recipients, new Uint8Array(), {
+                    reportMissing: true,
+                    conversationId: { id: 'convid', domain: '' },
+                });
+                expect(apiClient.api.conversation.postOTRMessage).toHaveBeenCalledTimes(2);
+            });
             it('handles client mismatch internally if no onClientMismatch is given', async () => {
                 const [messageService, { apiClient }] = await buildMessageService();
                 let spyCounter = 0;

package/package.json

@@ -60,6 +60,6 @@
     "test:coverage": "jest --coverage",
     "watch": "tsc --watch"
   },
-  "version": "39.0.1",
-  "gitHead": "5422ef707d772e15f4ba5c2628113dddb217a2ae"
+  "version": "39.0.2",
+  "gitHead": "273aabdefe09d486c3b3cc11065794eec1bfe3ba"
 }