@wireapp/core 46.45.0 → 46.45.2

package/lib/Account.test.js

@@ -65,8 +65,10 @@ const MOCK_BACKEND = {
     rest: `https://${BASE_URL}`,
     ws: `wss://${BASE_URL}`,
 };
+const apiClients = [];
 async function createAccount() {
     const apiClient = new api_client_1.APIClient({ urls: MOCK_BACKEND });
+    apiClients.push(apiClient);
     const account = new Account_1.Account(apiClient);
     await account['initServices']({
         clientType: client_1.ClientType.TEMPORARY,
@@ -97,6 +99,9 @@ const waitFor = (assertion) => {
 /* eslint-disable jest/no-conditional-expect */
 describe('Account', () => {
     const CLIENT_ID = '4e37b32f57f6da55';
+    afterAll(() => {
+        apiClients.forEach(client => client.disconnect());
+    });
     // Fix for node 16, crypto.subtle.decrypt has a type problem
     jest.spyOn(global.crypto.subtle, 'decrypt').mockResolvedValue(new Uint8Array(32));
     const accessTokenData = {
@@ -194,6 +199,9 @@ describe('Account', () => {
     describe('"init"', () => {
         it('initializes the Protocol buffers', async () => {
             const account = new Account_1.Account();
+            if (account['apiClient']) {
+                apiClients.push(account['apiClient']);
+            }
             await account['initServices']({ clientType: client_1.ClientType.TEMPORARY, userId: '' });
             expect(account.service.conversation).toBeDefined();
             const message = protocol_messaging_1.GenericMessage.create({
@@ -206,6 +214,7 @@ describe('Account', () => {
     describe('"login"', () => {
         it('logs in with correct credentials', async () => {
             const apiClient = new api_client_1.APIClient({ urls: MOCK_BACKEND });
+            apiClients.push(apiClient);
             const account = new Account_1.Account(apiClient);
             await account['initServices']({ clientType: client_1.ClientType.TEMPORARY, userId: '' });
             const { clientType, userId } = await account.login({
@@ -218,6 +227,7 @@ describe('Account', () => {
         });
         it('does not log in with incorrect credentials', async () => {
             const apiClient = new api_client_1.APIClient({ urls: MOCK_BACKEND });
+            apiClients.push(apiClient);
             const account = new Account_1.Account(apiClient);
             let backendError;
             await account['initServices']({ clientType: client_1.ClientType.TEMPORARY, userId: '' });

package/lib/conversation/AssetService/AssetService.d.ts

@@ -31,9 +31,9 @@ export declare class AssetService {
      */
     uploadRawAsset(asset: Buffer | Uint8Array, options?: AssetOptions, progressCallback?: ProgressCallback): RequestCancelable<{
         key: string;
-        token: string;
-        expires: string;
-        domain?: string | undefined;
+        domain: string;
+        token?: string | undefined;
+        expires?: string | undefined;
     }>;
     /**
      * Will encrypt and upload an asset to the backend

package/lib/conversation/AssetService/AssetService.test.js

@@ -23,10 +23,15 @@ const api_client_1 = require("@wireapp/api-client");
 const AssetService_1 = require("./AssetService");
 describe('AssetService', () => {
     describe('"uploadAsset"', () => {
+        let apiClient;
+        afterEach(() => {
+            apiClient?.disconnect();
+        });
         it('builds an encrypted asset payload', async () => {
-            const apiClient = new api_client_1.APIClient();
+            apiClient = new api_client_1.APIClient();
             const assetService = new AssetService_1.AssetService(apiClient);
             const assetServerData = {
+                domain: 'asset-server.test.wire.com',
                 key: `3-2-${(0, uuid_1.v4)()}`,
                 token: (0, uuid_1.v4)(),
                 expires: '',
@@ -44,7 +49,7 @@ describe('AssetService', () => {
             }));
         });
         it('allows cancelling asset upload', async () => {
-            const apiClient = new api_client_1.APIClient();
+            apiClient = new api_client_1.APIClient();
             const assetService = new AssetService_1.AssetService(apiClient);
             const apiUpload = {
                 cancel: jest.fn(),
@@ -56,7 +61,7 @@ describe('AssetService', () => {
             expect(apiUpload.cancel).toHaveBeenCalled();
         });
         it('exposes upload progress', async () => {
-            const apiClient = new api_client_1.APIClient();
+            apiClient = new api_client_1.APIClient();
             const assetService = new AssetService_1.AssetService(apiClient);
             const apiUpload = {
                 cancel: jest.fn(),

package/lib/conversation/ConversationService/ConversationService.test.js

@@ -89,9 +89,14 @@ const mockedProteusService = {
     encryptGenericMessage: () => Promise.resolve(),
     sendProteusMessage: () => Promise.resolve({ sentAt: new Date() }),
 };
+const apiClients = [];
 describe('ConversationService', () => {
+    afterAll(() => {
+        apiClients.forEach(client => client.disconnect());
+    });
     async function buildConversationService() {
         const client = new api_client_1.APIClient({ urls: api_client_1.APIClient.BACKEND.STAGING });
+        apiClients.push(client);
         jest.spyOn(client.api.conversation, 'postMlsMessage').mockReturnValue(Promise.resolve({
             events: [],
             time: new Date().toISOString(),
@@ -999,6 +1004,7 @@ function generateImage() {
             keyBytes: Buffer.from([]),
             sha256: Buffer.from([]),
             token: '',
+            domain: 'example.com',
         },
     };
 }

package/lib/conversation/SubconversationService/SubconversationService.test.js

@@ -36,8 +36,10 @@ const getSubconversationResponse = ({ epoch, epochTimestamp, parentConversationI
         epoch_timestamp: epochTimestamp,
     };
 };
+const apiClients = [];
 const buildSubconversationService = async (isFederated = false) => {
     const apiClient = new api_client_1.APIClient({ urls: api_client_1.APIClient.BACKEND.STAGING });
+    apiClients.push(apiClient);
     apiClient.backendFeatures.isFederated = isFederated;
     const mlsService = {
         conversationExists: jest.fn(),
@@ -58,6 +60,9 @@ const buildSubconversationService = async (isFederated = false) => {
     return [subconversationService, { apiClient, mlsService, coreDatabase }];
 };
 describe('SubconversationService', () => {
+    afterAll(() => {
+        apiClients.forEach(client => client.disconnect());
+    });
     describe('joinConferenceSubconversation', () => {
         afterEach(() => {
             jest.useRealTimers();

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

@@ -71,14 +71,20 @@ function fakeEncrypt(_, recipients) {
     }, {});
     return Promise.resolve({ payloads: encryptedPayload });
 }
+const apiClients = [];
 const buildMessageService = async () => {
     const apiClient = new api_client_1.APIClient();
+    apiClients.push(apiClient);
     const [proteusService] = await (0, ProteusService_mocks_1.buildProteusService)();
     const messageService = new MessageService_1.MessageService(apiClient, proteusService);
     jest.spyOn(proteusService, 'encrypt').mockImplementation(fakeEncrypt);
     return [messageService, { apiClient, proteusService }];
 };
 describe('MessageService', () => {
+    afterAll(() => {
+        apiClients.forEach(client => client.disconnect());
+        (0, ProteusService_mocks_1.cleanupProteusServiceMocks)();
+    });
     describe('sendMessage', () => {
         const generateUsers = (userCount, clientsPerUser) => {
             return Array.from(Array(userCount)).map((_, i) => ({

package/lib/cryptography/AssetCryptography/EncryptedAsset.d.ts

@@ -6,7 +6,7 @@ export interface EncryptedAsset {
 }
 export interface EncryptedAssetUploaded extends EncryptedAsset {
     key: string;
-    domain?: string;
-    token: string;
+    domain: string;
+    token?: string;
 }
 //# sourceMappingURL=EncryptedAsset.d.ts.map

package/lib/cryptography/AssetCryptography/EncryptedAsset.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EncryptedAsset.d.ts","sourceRoot":"","sources":["../../../src/cryptography/AssetCryptography/EncryptedAsset.ts"],"names":[],"mappings":"AAmBA,MAAM,WAAW,cAAc;IAC7B,UAAU,EAAE,UAAU,CAAC;IACvB,QAAQ,EAAE,UAAU,CAAC;IACrB,sCAAsC;IACtC,MAAM,EAAE,UAAU,CAAC;CACpB;AAED,MAAM,WAAW,sBAAuB,SAAQ,cAAc;IAC5D,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;CACf"}
+{"version":3,"file":"EncryptedAsset.d.ts","sourceRoot":"","sources":["../../../src/cryptography/AssetCryptography/EncryptedAsset.ts"],"names":[],"mappings":"AAmBA,MAAM,WAAW,cAAc;IAC7B,UAAU,EAAE,UAAU,CAAC;IACvB,QAAQ,EAAE,UAAU,CAAC;IACrB,sCAAsC;IACtC,MAAM,EAAE,UAAU,CAAC;CACpB;AAED,MAAM,WAAW,sBAAuB,SAAQ,cAAc;IAC5D,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB"}

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

@@ -70,8 +70,10 @@ const defaultMLSInitConfig = {
 // Needs to be divisible by 4 to be a valid base64 string
 const mockGroupId = 'Z3JvdXAtdGVzdC0x';
 const mockedMLSWelcomeEventData = '';
+const apiClients = [];
 const createMLSService = async () => {
     const apiClient = new api_client_1.APIClient();
+    apiClients.push(apiClient);
     const transactionContext = {
         mlsInit: jest.fn(),
         wipeConversation: jest.fn(),
@@ -112,6 +114,9 @@ afterAll(() => {
     jest.clearAllTimers();
 });
 describe('MLSService', () => {
+    afterAll(() => {
+        apiClients.forEach(client => client.disconnect());
+    });
     describe('registerConversation', () => {
         let mlsService;
         let apiClient;

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

@@ -5,4 +5,5 @@ export declare const buildProteusService: () => Promise<[ProteusService, {
     apiClient: APIClient;
     cryptoClient: CryptoClient;
 }]>;
+export declare const cleanupProteusServiceMocks: () => void;
 //# sourceMappingURL=ProteusService.mocks.d.ts.map

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

@@ -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;AAE9C,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAC;AAE5C,OAAO,EAAC,cAAc,EAAC,MAAM,kBAAkB,CAAC;AAKhD,eAAO,MAAM,mBAAmB,QAAa,OAAO,CAClD,CAAC,cAAc,EAAE;IAAC,SAAS,EAAE,SAAS,CAAC;IAAC,YAAY,EAAE,YAAY,CAAA;CAAC,CAAC,CAwBrE,CAAC"}
+{"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;AAOhD,eAAO,MAAM,mBAAmB,QAAa,OAAO,CAClD,CAAC,cAAc,EAAE;IAAC,SAAS,EAAE,SAAS,CAAC;IAAC,YAAY,EAAE,YAAY,CAAA;CAAC,CAAC,CAyBrE,CAAC;AAEF,eAAO,MAAM,0BAA0B,YAGtC,CAAC"}

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

@@ -18,15 +18,17 @@
  *
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildProteusService = void 0;
+exports.cleanupProteusServiceMocks = exports.buildProteusService = void 0;
 const client_1 = require("@wireapp/api-client/lib/client");
 const api_client_1 = require("@wireapp/api-client");
 const CoreCryptoWrapper_1 = require("./CryptoClient/CoreCryptoWrapper/CoreCryptoWrapper");
 const ProteusService_1 = require("./ProteusService");
 const PayloadHelper_1 = require("../../../test/PayloadHelper");
 const StoreHelper_1 = require("../../../test/StoreHelper");
+const createdApiClients = [];
 const buildProteusService = async () => {
     const apiClient = new api_client_1.APIClient({ urls: api_client_1.APIClient.BACKEND.STAGING });
+    createdApiClients.push(apiClient);
     apiClient.context = {
         clientType: client_1.ClientType.NONE,
         userId: (0, PayloadHelper_1.getUUID)(),
@@ -40,3 +42,8 @@ const buildProteusService = async () => {
     return [proteusService, { apiClient, cryptoClient }];
 };
 exports.buildProteusService = buildProteusService;
+const cleanupProteusServiceMocks = () => {
+    createdApiClients.forEach(client => client.disconnect());
+    createdApiClients.length = 0;
+};
+exports.cleanupProteusServiceMocks = cleanupProteusServiceMocks;

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

@@ -128,6 +128,9 @@ const prepareDataForEncryption = async () => {
     };
 };
 describe('ProteusService', () => {
+    afterAll(() => {
+        (0, ProteusService_mocks_1.cleanupProteusServiceMocks)();
+    });
     const domain1 = 'domain1';
     const domain2 = 'domain2';
     const domain3 = 'domain3';

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

@@ -44,18 +44,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 /* eslint-disable import/order */
 const GenericMessageParams = __importStar(require("../Utility/getGenericMessageParams"));
 const client_1 = require("@wireapp/api-client/lib/client");
+const team_1 = require("@wireapp/api-client/lib/team");
 const conversation_1 = require("../../../conversation");
 const MessageBuilder_1 = require("../../../conversation/message/MessageBuilder");
 const ProteusService_mocks_1 = require("./ProteusService.mocks");
-const team_1 = require("@wireapp/api-client/lib/team");
 jest.mock('../Utility/getGenericMessageParams', () => {
     return {
         getGenericMessageParams: jest.fn(),
     };
 });
 const MockedGenericMessageParams = GenericMessageParams;
+const apiClients = [];
 const prepareProteusService = async () => {
     const [proteusService, { apiClient }] = await (0, ProteusService_mocks_1.buildProteusService)();
+    apiClients.push(apiClient);
     jest.spyOn(apiClient.api.user, 'postListClients').mockImplementation(() => Promise.resolve({
         qualified_user_map: {
             'test-domain': {
@@ -74,6 +76,8 @@ const prepareProteusService = async () => {
 };
 afterAll(() => {
     jest.clearAllTimers();
+    apiClients.forEach(client => client.disconnect());
+    (0, ProteusService_mocks_1.cleanupProteusServiceMocks)();
 });
 describe('sendGenericMessage', () => {
     describe('targetted messages', () => {

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

@@ -61,6 +61,7 @@ describe('SessionHandler', () => {
     });
     afterAll(() => {
         jest.clearAllTimers();
+        apiClient.disconnect();
     });
     describe('constructSessionId', () => {
         describe('constructs a session ID', () => {

package/lib/notification/NotificationService.test.js

@@ -28,12 +28,17 @@ const MOCK_BACKEND = {
     ws: `wss://${BASE_URL}`,
 };
 const mockedConversationService = {};
+const apiClients = [];
 describe('NotificationService', () => {
+    afterAll(() => {
+        apiClients.forEach(client => client.disconnect());
+    });
     describe('handleEvent', () => {
         it('propagates errors to the outer calling function', async () => {
             const storeEngine = new store_engine_1.MemoryEngine();
             await storeEngine.init('NotificationService.test');
             const apiClient = new api_client_1.APIClient({ urls: MOCK_BACKEND });
+            apiClients.push(apiClient);
             const notificationService = new _1.NotificationService(apiClient, storeEngine, mockedConversationService);
             jest.spyOn(notificationService, 'handleEvent').mockImplementation(() => {
                 throw new Error('Test error');
@@ -57,6 +62,7 @@ describe('NotificationService', () => {
             const storeEngine = new store_engine_1.MemoryEngine();
             await storeEngine.init('NotificationService.test');
             const apiClient = new api_client_1.APIClient({ urls: MOCK_BACKEND });
+            apiClients.push(apiClient);
             const notificationService = new _1.NotificationService(apiClient, storeEngine, mockedConversationService);
             jest.spyOn(notificationService, 'handleEvent').mockReturnValue({});
             const spySetLastNotificationId = jest
@@ -75,6 +81,7 @@ describe('NotificationService', () => {
             const storeEngine = new store_engine_1.MemoryEngine();
             await storeEngine.init('NotificationService.test');
             const apiClient = new api_client_1.APIClient({ urls: MOCK_BACKEND });
+            apiClients.push(apiClient);
             const notificationService = new _1.NotificationService(apiClient, storeEngine, mockedConversationService);
             jest.spyOn(notificationService, 'handleEvent').mockReturnValue({});
             const spySetLastNotificationId = jest
@@ -93,6 +100,7 @@ describe('NotificationService', () => {
                 const storeEngine = new store_engine_1.MemoryEngine();
                 await storeEngine.init('NotificationService.test');
                 const apiClient = new api_client_1.APIClient({ urls: MOCK_BACKEND });
+                apiClients.push(apiClient);
                 const notificationService = new _1.NotificationService(apiClient, storeEngine, mockedConversationService);
                 notificationService.on(_1.NotificationService.TOPIC.NOTIFICATION_ERROR, notificationError => {
                     expect(notificationError.error.message).toBe('Test error');

package/lib/self/SelfService.test.js

@@ -31,6 +31,9 @@ describe('SelfService', () => {
     describe('putSupportedProtocols', () => {
         const apiClient = new api_client_1.APIClient({ urls: MOCK_BACKEND });
         apiClient.backendFeatures.supportsMLS = true;
+        afterAll(() => {
+            apiClient.disconnect();
+        });
         it('updates the list of self supported protocols', async () => {
             const selfService = new SelfService_1.SelfService(apiClient);
             const supportedProtocols = [team_1.CONVERSATION_PROTOCOL.PROTEUS, team_1.CONVERSATION_PROTOCOL.MLS];

package/package.json

@@ -11,9 +11,9 @@
     "./lib/cryptography/AssetCryptography/crypto.node": "./lib/cryptography/AssetCryptography/crypto.browser.js"
   },
   "dependencies": {
-    "@wireapp/api-client": "^27.87.0",
+    "@wireapp/api-client": "^27.88.0",
     "@wireapp/commons": "^5.4.9",
-    "@wireapp/core-crypto": "9.1.0",
+    "@wireapp/core-crypto": "9.1.2",
     "@wireapp/cryptobox": "12.8.0",
     "@wireapp/priority-queue": "^2.1.16",
     "@wireapp/promise-queue": "^2.4.9",
@@ -61,6 +61,6 @@
     "test:coverage": "jest --coverage",
     "watch": "tsc --watch"
   },
-  "version": "46.45.0",
-  "gitHead": "031bc333d66a0228a3475dc0a10b5c3685784132"
+  "version": "46.45.2",
+  "gitHead": "08b1f644410ec68bf35c063c3c49eaae4e2a95e7"
 }