@wireapp/core 46.46.6-beta.14.f6fd03fe6 → 46.46.6-beta.28.9d3034481

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

@@ -49,9 +49,10 @@ const MessageBuilder_1 = require("../../../conversation/message/MessageBuilder")
 const ProteusService_mocks_1 = require("./ProteusService.mocks");
 const SessionHandler_1 = require("../Utility/SessionHandler");
 const event_1 = require("@wireapp/api-client/lib/event");
-const protocol_messaging_1 = require("@pydio/protocol-messaging");
+const protocol_messaging_1 = require("@wireapp/protocol-messaging");
 const errors_1 = require("../../../errors");
 const testUtils_1 = require("../../../testUtils");
+const team_1 = require("@wireapp/api-client/lib/team");
 jest.mock('./CryptoClient/CoreCryptoWrapper/PrekeysTracker', () => {
     return {
         PrekeyTracker: jest.fn().mockImplementation(() => {
@@ -127,6 +128,9 @@ const prepareDataForEncryption = async () => {
     };
 };
 describe('ProteusService', () => {
+    afterAll(() => {
+        (0, ProteusService_mocks_1.cleanupProteusServiceMocks)();
+    });
     const domain1 = 'domain1';
     const domain2 = 'domain2';
     const domain3 = 'domain3';
@@ -346,7 +350,7 @@ describe('ProteusService', () => {
                 const params = {
                     conversationId: (0, testUtils_1.generateQualifiedId)('domain'),
                     payload: message,
-                    protocol: conversation_1.ConversationProtocol.PROTEUS,
+                    protocol: team_1.CONVERSATION_PROTOCOL.PROTEUS,
                     targetMode: conversation_2.MessageTargetMode.USERS,
                 };
                 try {
@@ -371,7 +375,7 @@ describe('ProteusService', () => {
                     MockedRecipients.getRecipientsForConversation.mockResolvedValue({});
                     jest.spyOn(proteusService['messageService'], 'sendMessage').mockReturnValue(Promise.resolve({}));
                     await proteusService.sendMessage({
-                        protocol: conversation_1.ConversationProtocol.PROTEUS,
+                        protocol: team_1.CONVERSATION_PROTOCOL.PROTEUS,
                         payload: message,
                         targetMode: conversation_2.MessageTargetMode.USERS,
                         userIds: recipients,
@@ -398,7 +402,7 @@ describe('ProteusService', () => {
                     MockedRecipients.getRecipientsForConversation.mockResolvedValue({});
                     jest.spyOn(proteusService['messageService'], 'sendMessage').mockResolvedValue({});
                     await proteusService.sendMessage({
-                        protocol: conversation_1.ConversationProtocol.PROTEUS,
+                        protocol: team_1.CONVERSATION_PROTOCOL.PROTEUS,
                         conversationId: { id: 'conv1', domain: 'domain1' },
                         payload: message,
                         targetMode: conversation_2.MessageTargetMode.USERS,
@@ -426,7 +430,7 @@ describe('ProteusService', () => {
                     jest.spyOn(proteusService['messageService'], 'sendMessage').mockReturnValue(Promise.resolve({}));
                     await proteusService.sendMessage({
                         conversationId: { id: 'conv1', domain: '' },
-                        protocol: conversation_1.ConversationProtocol.PROTEUS,
+                        protocol: team_1.CONVERSATION_PROTOCOL.PROTEUS,
                         payload: message,
                         targetMode: conversation_2.MessageTargetMode.USERS_CLIENTS,
                         userIds: recipients,
@@ -447,7 +451,7 @@ describe('ProteusService', () => {
                     MockedRecipients.getRecipientsForConversation.mockResolvedValue({});
                     jest.spyOn(proteusService['messageService'], 'sendMessage').mockReturnValue(Promise.resolve({}));
                     await proteusService.sendMessage({
-                        protocol: conversation_1.ConversationProtocol.PROTEUS,
+                        protocol: team_1.CONVERSATION_PROTOCOL.PROTEUS,
                         conversationId: { id: 'conv1', domain: 'domain1' },
                         payload: message,
                         targetMode: conversation_2.MessageTargetMode.USERS_CLIENTS,
@@ -473,7 +477,7 @@ describe('ProteusService', () => {
                     deleted: {},
                 });
                 const result = await proteusService.sendMessage({
-                    protocol: conversation_1.ConversationProtocol.PROTEUS,
+                    protocol: team_1.CONVERSATION_PROTOCOL.PROTEUS,
                     conversationId: (0, testUtils_1.generateQualifiedId)('domain'),
                     payload: message,
                     targetMode: conversation_2.MessageTargetMode.USERS_CLIENTS,
@@ -556,9 +560,9 @@ describe('ProteusService', () => {
     describe('createConversation', () => {
         const newConversation = {
             qualified_id: { id: '', domain: '' },
-            id: '',
             type: conversation_1.CONVERSATION_TYPE.REGULAR,
             creator: '',
+            cells_state: conversation_1.CONVERSATION_CELLS_STATE.DISABLED,
             access: [],
             access_role: [conversation_1.CONVERSATION_ACCESS_ROLE.GUEST],
             members: {
@@ -575,7 +579,7 @@ describe('ProteusService', () => {
                     status_time: '',
                 },
             },
-            protocol: conversation_1.ConversationProtocol.PROTEUS,
+            protocol: team_1.CONVERSATION_PROTOCOL.PROTEUS,
         };
         it('adds all requested users to a new conversation', async () => {
             const [proteusService, { apiClient }] = await (0, ProteusService_mocks_1.buildProteusService)();

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

@@ -1,4 +1,5 @@
-import { QualifiedUserClients, MessageSendingStatus, ConversationProtocol, NewConversation } from '@wireapp/api-client/lib/conversation';
+import { QualifiedUserClients, MessageSendingStatus, NewConversation } from '@wireapp/api-client/lib/conversation';
+import { CONVERSATION_PROTOCOL } from '@wireapp/api-client/lib/team';
 import { QualifiedId } from '@wireapp/api-client/lib/user';
 import { AddUsersParams, MessageSendingOptions, SendCommonParams } from '../../../conversation';
 export interface NewClient {
@@ -17,7 +18,7 @@ export type SendProteusMessageParams = SendCommonParams & MessageSendingOptions
      */
     userIds?: QualifiedId[] | QualifiedUserClients;
     onClientMismatch?: (status: MessageSendingStatus, wasSent: boolean) => void | boolean | Promise<boolean>;
-    protocol: ConversationProtocol.PROTEUS;
+    protocol: CONVERSATION_PROTOCOL.PROTEUS;
 };
 export type CreateProteusConversationParams = {
     conversationData: NewConversation | string;

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

@@ -1 +1 @@
-{"version":3,"file":"ProteusService.types.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/proteus/ProteusService/ProteusService.types.ts"],"names":[],"mappings":"AAmBA,OAAO,EACL,oBAAoB,EACpB,oBAAoB,EACpB,oBAAoB,EACpB,eAAe,EAChB,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AAEzD,OAAO,EAAC,cAAc,EAAE,qBAAqB,EAAE,gBAAgB,EAAC,MAAM,uBAAuB,CAAC;AAE9F,MAAM,WAAW,SAAS;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,WAAW,CAAC;CACrB;AACD,MAAM,MAAM,oBAAoB,GAAG;IACjC,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE,SAAS,KAAK,IAAI,CAAC;IAC1C,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG,gBAAgB,GACrD,qBAAqB,GAAG;IACtB;;;;OAIG;IACH,OAAO,CAAC,EAAE,WAAW,EAAE,GAAG,oBAAoB,CAAC;IAC/C,gBAAgB,CAAC,EAAE,CAAC,MAAM,EAAE,oBAAoB,EAAE,OAAO,EAAE,OAAO,KAAK,IAAI,GAAG,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACzG,QAAQ,EAAE,oBAAoB,CAAC,OAAO,CAAC;CACxC,CAAC;AAEJ,MAAM,MAAM,+BAA+B,GAAG;IAC5C,gBAAgB,EAAE,eAAe,GAAG,MAAM,CAAC;IAC3C,YAAY,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;CAClC,CAAC;AAEF,MAAM,MAAM,mCAAmC,GAAG,IAAI,CAAC,cAAc,EAAE,SAAS,CAAC,CAAC"}
+{"version":3,"file":"ProteusService.types.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/proteus/ProteusService/ProteusService.types.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,oBAAoB,EAAE,oBAAoB,EAAE,eAAe,EAAC,MAAM,sCAAsC,CAAC;AACjH,OAAO,EAAC,qBAAqB,EAAC,MAAM,8BAA8B,CAAC;AACnE,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AAEzD,OAAO,EAAC,cAAc,EAAE,qBAAqB,EAAE,gBAAgB,EAAC,MAAM,uBAAuB,CAAC;AAE9F,MAAM,WAAW,SAAS;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,WAAW,CAAC;CACrB;AACD,MAAM,MAAM,oBAAoB,GAAG;IACjC,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE,SAAS,KAAK,IAAI,CAAC;IAC1C,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG,gBAAgB,GACrD,qBAAqB,GAAG;IACtB;;;;OAIG;IACH,OAAO,CAAC,EAAE,WAAW,EAAE,GAAG,oBAAoB,CAAC;IAC/C,gBAAgB,CAAC,EAAE,CAAC,MAAM,EAAE,oBAAoB,EAAE,OAAO,EAAE,OAAO,KAAK,IAAI,GAAG,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACzG,QAAQ,EAAE,qBAAqB,CAAC,OAAO,CAAC;CACzC,CAAC;AAEJ,MAAM,MAAM,+BAA+B,GAAG;IAC5C,gBAAgB,EAAE,eAAe,GAAG,MAAM,CAAC;IAC3C,YAAY,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;CAClC,CAAC;AAEF,MAAM,MAAM,mCAAmC,GAAG,IAAI,CAAC,cAAc,EAAE,SAAS,CAAC,CAAC"}

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

@@ -44,8 +44,8 @@ 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 conversation_1 = require("@wireapp/api-client/lib/conversation");
-const conversation_2 = require("../../../conversation");
+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");
 jest.mock('../Utility/getGenericMessageParams', () => {
@@ -54,8 +54,10 @@ jest.mock('../Utility/getGenericMessageParams', () => {
     };
 });
 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': {
@@ -72,6 +74,11 @@ const prepareProteusService = async () => {
         .mockImplementation(data => Promise.resolve(data));
     return proteusService;
 };
+afterAll(() => {
+    jest.clearAllTimers();
+    apiClients.forEach(client => client.disconnect());
+    (0, ProteusService_mocks_1.cleanupProteusServiceMocks)();
+});
 describe('sendGenericMessage', () => {
     describe('targetted messages', () => {
         it(`indicates when sending was canceled`, async () => {
@@ -86,9 +93,9 @@ describe('sendGenericMessage', () => {
             const payloadBundle = await proteusService.sendMessage({
                 payload: message,
                 conversationId: { id: 'conv1', domain: '' },
-                protocol: conversation_1.ConversationProtocol.PROTEUS,
+                protocol: team_1.CONVERSATION_PROTOCOL.PROTEUS,
             });
-            expect(payloadBundle.state).toBe(conversation_2.MessageSendingState.CANCELED);
+            expect(payloadBundle.state).toBe(conversation_1.MessageSendingState.CANCELED);
         });
     });
 });

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

@@ -3,9 +3,5 @@ export declare const cryptoMigrationStore: {
         isReady: (dbName: string) => boolean;
         markAsReady: (dbName: string) => void;
     };
-    coreCrypto: {
-        isReady: (dbName: string) => boolean;
-        markAsReady: (dbName: string) => void;
-    };
 };
 //# sourceMappingURL=cryptoMigrationStateStore.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"cryptoMigrationStateStore.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/proteus/ProteusService/cryptoMigrationStateStore.ts"],"names":[],"mappings":"AA6CA,eAAO,MAAM,oBAAoB;;0BAPyC,MAAM;8BANJ,MAAM;;;0BAMR,MAAM;8BANJ,MAAM;;CAsBjF,CAAC"}
+{"version":3,"file":"cryptoMigrationStateStore.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/proteus/ProteusService/cryptoMigrationStateStore.ts"],"names":[],"mappings":"AA4CA,eAAO,MAAM,oBAAoB;;0BAPyC,MAAM;8BANJ,MAAM;;CAkBjF,CAAC"}

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

@@ -29,7 +29,6 @@ function getLocalStorage() {
 }
 const MIGRATION_READY_STATE = '1';
 const getQualifiedSessionsReadyKey = (dbName) => `${dbName}-qualified-sessions-ready`;
-const getCoreCryptoReadyKey = (dbName) => `${dbName}-corecrypto-ready`;
 const markMigrationReady = (getKey) => (dbName) => {
     const key = getKey(dbName);
     const localStorage = getLocalStorage();
@@ -46,8 +45,4 @@ exports.cryptoMigrationStore = {
         isReady: isMigrationReady(getQualifiedSessionsReadyKey),
         markAsReady: markMigrationReady(getQualifiedSessionsReadyKey),
     },
-    coreCrypto: {
-        isReady: isMigrationReady(getCoreCryptoReadyKey),
-        markAsReady: markMigrationReady(getCoreCryptoReadyKey),
-    },
 };

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

@@ -2,6 +2,7 @@ import { CRUDEngine } from '@wireapp/store-engine';
 /**
  * Will remove any information relative to the client identity.
  * @param storeEngine The engine that currently holds the identity information
+ * @param spareKeys If true, the keys table will not be deleted
  */
-export declare function deleteIdentity(storeEngine: CRUDEngine): Promise<boolean[]>;
+export declare function deleteIdentity(storeEngine: CRUDEngine, spareKeys?: boolean): Promise<boolean[]>;
 //# sourceMappingURL=identityClearer.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"identityClearer.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/proteus/ProteusService/identityClearer.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAC;AAKjD;;;GAGG;AACH,wBAAgB,cAAc,CAAC,WAAW,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAK1E"}
+{"version":3,"file":"identityClearer.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/proteus/ProteusService/identityClearer.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAC;AAKjD;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,WAAW,EAAE,UAAU,EAAE,SAAS,UAAQ,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAW7F"}

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

@@ -24,9 +24,15 @@ const IDENTITY_STORES = ['amplify', 'clients', 'keys', 'prekeys', 'sessions', 'g
 /**
  * Will remove any information relative to the client identity.
  * @param storeEngine The engine that currently holds the identity information
+ * @param spareKeys If true, the keys table will not be deleted
  */
-function deleteIdentity(storeEngine) {
+function deleteIdentity(storeEngine, spareKeys = false) {
     return Promise.all(
     //make sure we use enum's lowercase values, not uppercase keys
-    IDENTITY_STORES.map(store => storeEngine.deleteAll(store)));
+    IDENTITY_STORES.map(store => {
+        if (store === 'keys' && spareKeys) {
+            return Promise.resolve(true);
+        }
+        return storeEngine.deleteAll(store);
+    }));
 }

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

@@ -59,6 +59,10 @@ describe('SessionHandler', () => {
     beforeAll(() => {
         jest.spyOn(apiClient.api.user, 'postMultiPreKeyBundles').mockImplementation(generatePrekeys);
     });
+    afterAll(() => {
+        jest.clearAllTimers();
+        apiClient.disconnect();
+    });
     describe('constructSessionId', () => {
         describe('constructs a session ID', () => {
             it('without a domain', () => {

package/lib/messagingProtocols/proteus/Utility/getGenericMessageParams.d.ts

@@ -1,7 +1,7 @@
-import { GenericMessage } from '@pydio/protocol-messaging';
 import { APIClient } from '@wireapp/api-client/lib/APIClient';
 import { QualifiedUserClients } from '@wireapp/api-client/lib/conversation';
 import { QualifiedId, QualifiedUserPreKeyBundleMap } from '@wireapp/api-client/lib/user';
+import { GenericMessage } from '@wireapp/protocol-messaging';
 import { MessageSendingOptions } from '../../../conversation';
 export type MessageParams = {
     sendingClientId: string;

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

@@ -1 +1 @@
-{"version":3,"file":"getGenericMessageParams.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/proteus/Utility/getGenericMessageParams.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,cAAc,EAAC,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAC,SAAS,EAAC,MAAM,mCAAmC,CAAC;AAC5D,OAAO,EAAC,oBAAoB,EAAC,MAAM,sCAAsC,CAAC;AAC1E,OAAO,EAAC,WAAW,EAAE,4BAA4B,EAAC,MAAM,8BAA8B,CAAC;AAKvF,OAAO,EAAoB,qBAAqB,EAAC,MAAM,uBAAuB,CAAC;AAG/E,MAAM,MAAM,aAAa,GAAG;IAC1B,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,EAAE,oBAAoB,GAAG,4BAA4B,CAAC;IAChE,SAAS,EAAE,UAAU,CAAC;IACtB,OAAO,EAAE;QACP,cAAc,EAAE,WAAW,CAAC;QAC5B,UAAU,EAAE,OAAO,GAAG,SAAS,CAAC;QAChC,aAAa,EAAE,OAAO,GAAG,WAAW,EAAE,GAAG,SAAS,CAAC;KACpD,CAAC;CACH,CAAC;AACF,UAAU,6BAA6B;IACrC,eAAe,EAAE,MAAM,CAAC;IACxB,cAAc,EAAE,WAAW,CAAC;IAC5B,cAAc,EAAE,cAAc,CAAC;IAC/B,OAAO,EAAE,qBAAqB,CAAC;IAC/B,SAAS,EAAE,SAAS,CAAC;CACtB;AACD,KAAK,iCAAiC,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;AAEhE,QAAA,MAAM,uBAAuB,kHAM1B,6BAA6B,KAAG,iCA0BlC,CAAC;AAEF,OAAO,EAAC,uBAAuB,EAAC,CAAC"}
+{"version":3,"file":"getGenericMessageParams.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/proteus/Utility/getGenericMessageParams.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,SAAS,EAAC,MAAM,mCAAmC,CAAC;AAC5D,OAAO,EAAC,oBAAoB,EAAC,MAAM,sCAAsC,CAAC;AAC1E,OAAO,EAAC,WAAW,EAAE,4BAA4B,EAAC,MAAM,8BAA8B,CAAC;AAEvF,OAAO,EAAC,cAAc,EAAC,MAAM,6BAA6B,CAAC;AAK3D,OAAO,EAAoB,qBAAqB,EAAC,MAAM,uBAAuB,CAAC;AAG/E,MAAM,MAAM,aAAa,GAAG;IAC1B,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,EAAE,oBAAoB,GAAG,4BAA4B,CAAC;IAChE,SAAS,EAAE,UAAU,CAAC;IACtB,OAAO,EAAE;QACP,cAAc,EAAE,WAAW,CAAC;QAC5B,UAAU,EAAE,OAAO,GAAG,SAAS,CAAC;QAChC,aAAa,EAAE,OAAO,GAAG,WAAW,EAAE,GAAG,SAAS,CAAC;KACpD,CAAC;CACH,CAAC;AACF,UAAU,6BAA6B;IACrC,eAAe,EAAE,MAAM,CAAC;IACxB,cAAc,EAAE,WAAW,CAAC;IAC5B,cAAc,EAAE,cAAc,CAAC;IAC/B,OAAO,EAAE,qBAAqB,CAAC;IAC/B,SAAS,EAAE,SAAS,CAAC;CACtB;AACD,KAAK,iCAAiC,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;AAEhE,QAAA,MAAM,uBAAuB,kHAM1B,6BAA6B,KAAG,iCA0BlC,CAAC;AAEF,OAAO,EAAC,uBAAuB,EAAC,CAAC"}

package/lib/messagingProtocols/proteus/Utility/getGenericMessageParams.js

@@ -19,7 +19,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getGenericMessageParams = void 0;
-const protocol_messaging_1 = require("@pydio/protocol-messaging");
+const protocol_messaging_1 = require("@wireapp/protocol-messaging");
 const Recipients_1 = require("./Recipients");
 const UserIds_1 = require("./UserIds");
 const conversation_1 = require("../../../conversation");

package/lib/notification/NotificationService.d.ts

@@ -1,8 +1,8 @@
-import { GenericMessage } from '@pydio/protocol-messaging';
 import { BackendEvent } from '@wireapp/api-client/lib/event';
 import { Notification } from '@wireapp/api-client/lib/notification/';
 import { APIClient } from '@wireapp/api-client';
 import { TypedEventEmitter } from '@wireapp/commons';
+import { GenericMessage } from '@wireapp/protocol-messaging';
 import { CRUDEngine } from '@wireapp/store-engine';
 import { NotificationSource } from './Notifications.types';
 import { ConversationService } from '../conversation';
@@ -49,13 +49,28 @@ export declare class NotificationService extends TypedEventEmitter<Events> {
     static readonly TOPIC: typeof TOPIC;
     constructor(apiClient: APIClient, storeEngine: CRUDEngine, conversationService: ConversationService);
     private getAllNotifications;
-    /** Should only be called with a completely new client. */
-    initializeNotificationStream(clientId: string): Promise<string>;
+    /**
+     * Should only be called with a completely new client.
+     *
+     * @deprecated This method is used to handle legacy notifications from the backend.
+     * It can be removed when all clients are capable of handling consumable notifications.
+     */
+    legacyInitializeNotificationStream(clientId: string): Promise<string>;
     hasHistory(): Promise<boolean>;
     getNotificationEventList(): Promise<BackendEvent[]>;
     setLastEventDate(eventDate: Date): Promise<Date>;
     private setLastNotificationId;
-    processNotificationStream(notificationHandler: NotificationHandler, onMissedNotifications: (notificationId: string) => void, abortHandler: AbortController): Promise<{
+    /**
+     * Processes the notification stream and calls the provided handler for each notification.
+     * If there are missed notifications, it will call the onMissedNotifications callback with the missed notification ID.
+     *
+     * @param notificationHandler - The handler to process each notification.
+     * @param onMissedNotifications - Callback to handle missed notifications.
+     * @returns An object containing the total number of notifications processed, number of errors, and successes.
+     *
+     * @deprecated When all client are migrated to the consumable/async notification stream, this method must be removed.
+     */
+    legacyProcessNotificationStream(notificationHandler: NotificationHandler, onMissedNotifications: (notificationId: string) => void, abortHandler?: AbortController): Promise<{
         total: number;
         error: number;
         success: number;
@@ -69,11 +84,10 @@ export declare class NotificationService extends TypedEventEmitter<Events> {
      * @param lastEventDate?
      */
     private isOutdatedEvent;
-    handleNotification(notification: Notification, source: NotificationSource, dryRun?: boolean): AsyncGenerator<HandledEventPayload>;
+    handleNotification(notification: Notification, source: NotificationSource): AsyncGenerator<HandledEventPayload>;
     /**
      * Will process one event
      * @param event The backend event to process
-     * @param dryRun Will not try to decrypt if true
      * @return event handling status and if event was handled, the payload
      */
     private handleEvent;

package/lib/notification/NotificationService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NotificationService.d.ts","sourceRoot":"","sources":["../../src/notification/NotificationService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"NotificationService.d.ts","sourceRoot":"","sources":["../../src/notification/NotificationService.ts"],"names":[],"mappings":"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"}

package/lib/notification/NotificationService.js

@@ -47,8 +47,13 @@ class NotificationService extends commons_1.TypedEventEmitter {
         const clientId = this.apiClient.clientId;
         return this.backend.getAllNotifications(clientId, since, abortController);
     }
-    /** Should only be called with a completely new client. */
-    async initializeNotificationStream(clientId) {
+    /**
+     * Should only be called with a completely new client.
+     *
+     * @deprecated This method is used to handle legacy notifications from the backend.
+     * It can be removed when all clients are capable of handling consumable notifications.
+     */
+    async legacyInitializeNotificationStream(clientId) {
         await this.setLastEventDate(new Date(0));
         const latestNotification = await this.backend.getLastNotification(clientId);
         return this.setLastNotificationId(latestNotification);
@@ -80,7 +85,17 @@ class NotificationService extends commons_1.TypedEventEmitter {
     async setLastNotificationId(lastNotification) {
         return this.database.updateLastNotificationId(lastNotification);
     }
-    async processNotificationStream(notificationHandler, onMissedNotifications, abortHandler) {
+    /**
+     * Processes the notification stream and calls the provided handler for each notification.
+     * If there are missed notifications, it will call the onMissedNotifications callback with the missed notification ID.
+     *
+     * @param notificationHandler - The handler to process each notification.
+     * @param onMissedNotifications - Callback to handle missed notifications.
+     * @returns An object containing the total number of notifications processed, number of errors, and successes.
+     *
+     * @deprecated When all client are migrated to the consumable/async notification stream, this method must be removed.
+     */
+    async legacyProcessNotificationStream(notificationHandler, onMissedNotifications, abortHandler) {
         const lastNotificationId = await this.database.getLastNotificationId();
         const { notifications, missedNotification } = await this.getAllNotifications(lastNotificationId, abortHandler);
         if (missedNotification) {
@@ -92,7 +107,7 @@ class NotificationService extends commons_1.TypedEventEmitter {
             : `No notification to process from the stream`;
         this.logger.log(logMessage);
         for (const [index, notification] of notifications.entries()) {
-            if (abortHandler.signal.aborted) {
+            if (abortHandler?.signal.aborted) {
                 /* Stop handling notifications if the websocket has been disconnected.
                  * Upon reconnecting we are going to restart handling the notification stream for where we left of
                  */
@@ -132,7 +147,7 @@ class NotificationService extends commons_1.TypedEventEmitter {
         }
         return false;
     }
-    async *handleNotification(notification, source, dryRun = false) {
+    async *handleNotification(notification, source) {
         for (const event of notification.payload) {
             this.logger.debug(`Handling event of type "${event.type}"`, event);
             let lastEventDate = undefined;
@@ -145,7 +160,7 @@ class NotificationService extends commons_1.TypedEventEmitter {
                 continue;
             }
             try {
-                const handledEventResult = await this.handleEvent(event, dryRun);
+                const handledEventResult = await this.handleEvent(event);
                 if (handledEventResult.status === 'handled' && handledEventResult.payload) {
                     yield handledEventResult.payload;
                 }
@@ -160,7 +175,7 @@ class NotificationService extends commons_1.TypedEventEmitter {
                 this.emit(NotificationService.TOPIC.NOTIFICATION_ERROR, notificationError);
             }
         }
-        if (!dryRun && !notification.transient) {
+        if (!notification.transient) {
             // keep track of the last handled notification for next time we fetch the notification stream
             await this.setLastNotificationId(notification);
         }
@@ -168,15 +183,9 @@ class NotificationService extends commons_1.TypedEventEmitter {
     /**
      * Will process one event
      * @param event The backend event to process
-     * @param dryRun Will not try to decrypt if true
      * @return event handling status and if event was handled, the payload
      */
-    async handleEvent(event, dryRun = false) {
-        if (dryRun) {
-            // In case of a dry run, we do not want to decrypt messages
-            // We just return the raw event to the caller
-            return { status: 'handled', payload: { event } };
-        }
+    async handleEvent(event) {
         const conversationEventResult = await this.conversationService.handleEvent(event);
         if (conversationEventResult.status !== 'unhandled') {
             return conversationEventResult;

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/secretStore/secretKeyGenerator.d.ts

@@ -4,6 +4,7 @@ export declare class CorruptedKeyError extends Error {
 export type GeneratedKey = {
     key: Uint8Array;
     deleteKey: () => Promise<void>;
+    freshlyGenerated: boolean;
 };
 /**
  * Will generate (or retrieve) a secret key from the database.

package/lib/secretStore/secretKeyGenerator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"secretKeyGenerator.d.ts","sourceRoot":"","sources":["../../src/secretStore/secretKeyGenerator.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,cAAc,EAAC,MAAM,kBAAkB,CAAC;AAEhD,qBAAa,iBAAkB,SAAQ,KAAK;CAAG;AAE/C,MAAM,MAAM,YAAY,GAAG;IACzB,GAAG,EAAE,UAAU,CAAC;IAChB,SAAS,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAChC,CAAC;AAEF;;GAEG;AACH,wBAAsB,iBAAiB,CAAC,EACtC,KAAK,EACL,OAAY,EACZ,SAAS,GACV,EAAE;IACD,wGAAwG;IACxG,KAAK,EAAE,MAAM,CAAC;IACd,kCAAkC;IAClC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,sDAAsD;IACtD,SAAS,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC;CAChC,GAAG,OAAO,CAAC,YAAY,CAAC,CA8BxB"}
+{"version":3,"file":"secretKeyGenerator.d.ts","sourceRoot":"","sources":["../../src/secretStore/secretKeyGenerator.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,cAAc,EAAC,MAAM,kBAAkB,CAAC;AAEhD,qBAAa,iBAAkB,SAAQ,KAAK;CAAG;AAE/C,MAAM,MAAM,YAAY,GAAG;IACzB,GAAG,EAAE,UAAU,CAAC;IAChB,SAAS,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/B,gBAAgB,EAAE,OAAO,CAAC;CAC3B,CAAC;AAEF;;GAEG;AACH,wBAAsB,iBAAiB,CAAC,EACtC,KAAK,EACL,OAAY,EACZ,SAAS,GACV,EAAE;IACD,wGAAwG;IACxG,KAAK,EAAE,MAAM,CAAC;IACd,kCAAkC;IAClC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,sDAAsD;IACtD,SAAS,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC;CAChC,GAAG,OAAO,CAAC,YAAY,CAAC,CAgCxB"}

package/lib/secretStore/secretKeyGenerator.js

@@ -27,6 +27,7 @@ exports.CorruptedKeyError = CorruptedKeyError;
  * Will generate (or retrieve) a secret key from the database.
  */
 async function generateSecretKey({ keyId, keySize = 16, secretsDb, }) {
+    let freshlyGenerated = false;
     try {
         let key;
         try {
@@ -48,8 +49,9 @@ async function generateSecretKey({ keyId, keySize = 16, secretsDb, }) {
             }, true, ['encrypt', 'decrypt']);
             key = new Uint8Array(await crypto.subtle.exportKey('raw', key));
             await secretsDb.saveSecretValue(keyId, key);
+            freshlyGenerated = true;
         }
-        return { key, deleteKey: () => secretsDb.deleteSecretValue(keyId) };
+        return { key, deleteKey: () => secretsDb.deleteSecretValue(keyId), freshlyGenerated };
     }
     catch (error) {
         throw error;

package/lib/self/SelfService.d.ts

@@ -1,5 +1,5 @@
-import { ConversationProtocol } from '@wireapp/api-client/lib/conversation';
 import { Self } from '@wireapp/api-client/lib/self/';
+import { CONVERSATION_PROTOCOL } from '@wireapp/api-client/lib/team';
 import { APIClient } from '@wireapp/api-client';
 export declare class SelfService {
     private readonly apiClient;
@@ -16,6 +16,6 @@ export declare class SelfService {
      * Update self user's list of supported-protocols
      * @param supportedProtocols The list of supported protocols
      */
-    putSupportedProtocols(supportedProtocols: ConversationProtocol[]): Promise<void>;
+    putSupportedProtocols(supportedProtocols: CONVERSATION_PROTOCOL[]): Promise<void>;
 }
 //# sourceMappingURL=SelfService.d.ts.map

package/lib/self/SelfService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SelfService.d.ts","sourceRoot":"","sources":["../../src/self/SelfService.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,oBAAoB,EAAC,MAAM,sCAAsC,CAAC;AAC1E,OAAO,EAAC,IAAI,EAAC,MAAM,+BAA+B,CAAC;AAEnD,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAG9C,qBAAa,WAAW;IAGV,OAAO,CAAC,QAAQ,CAAC,SAAS;IAFtC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAqD;gBAE/C,SAAS,EAAE,SAAS;IAEpC,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAKvD,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAMhD,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC;IAK1B,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAKxB,WAAW,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAKhD,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIpC,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAInD;;;OAGG;IACU,qBAAqB,CAAC,kBAAkB,EAAE,oBAAoB,EAAE;CAY9E"}
+{"version":3,"file":"SelfService.d.ts","sourceRoot":"","sources":["../../src/self/SelfService.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,IAAI,EAAC,MAAM,+BAA+B,CAAC;AACnD,OAAO,EAAC,qBAAqB,EAAC,MAAM,8BAA8B,CAAC;AAEnE,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAG9C,qBAAa,WAAW;IAGV,OAAO,CAAC,QAAQ,CAAC,SAAS;IAFtC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAqD;gBAE/C,SAAS,EAAE,SAAS;IAEpC,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAKvD,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAMhD,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC;IAK1B,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAKxB,WAAW,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAKhD,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIpC,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAInD;;;OAGG;IACU,qBAAqB,CAAC,kBAAkB,EAAE,qBAAqB,EAAE;CAY/E"}

package/lib/self/SelfService.test.js

@@ -18,7 +18,7 @@
  *
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-const conversation_1 = require("@wireapp/api-client/lib/conversation");
+const team_1 = require("@wireapp/api-client/lib/team");
 const api_client_1 = require("@wireapp/api-client");
 const SelfService_1 = require("./SelfService");
 const BASE_URL = 'mock-backend.wire.com';
@@ -31,9 +31,12 @@ 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 = [conversation_1.ConversationProtocol.PROTEUS, conversation_1.ConversationProtocol.MLS];
+            const supportedProtocols = [team_1.CONVERSATION_PROTOCOL.PROTEUS, team_1.CONVERSATION_PROTOCOL.MLS];
             jest.spyOn(apiClient.api.self, 'putSupportedProtocols').mockImplementation(jest.fn());
             await selfService.putSupportedProtocols(supportedProtocols);
             expect(apiClient.api.self.putSupportedProtocols).toHaveBeenCalledWith(supportedProtocols);

package/lib/team/TeamService.d.ts

@@ -1,4 +1,4 @@
-import { MemberData, Members, NewTeamData, TeamChunkData, TeamData, UpdateTeamData } from '@wireapp/api-client/lib/team/';
+import { FeatureList, MemberData, Members, NewTeamData, TeamChunkData, TeamData, UpdateTeamData } from '@wireapp/api-client/lib/team/';
 import { APIClient } from '@wireapp/api-client';
 export declare class TeamService {
     private readonly apiClient;
@@ -12,6 +12,9 @@ export declare class TeamService {
     removeMember(teamId: string, userId: string, password: string): Promise<void>;
     updateMember(teamId: string, memberData: MemberData): Promise<void>;
     updateTeam(teamId: string, teamData: UpdateTeamData): Promise<void>;
-    getCommonFeatureConfig(): Promise<import("@wireapp/api-client/lib/team/").FeatureList>;
+    private commonConfig;
+    private commonConfigFetchedAt;
+    private readonly CACHE_DURATION_MS;
+    getCommonFeatureConfig(): Promise<FeatureList>;
 }
 //# sourceMappingURL=TeamService.d.ts.map

package/lib/team/TeamService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TeamService.d.ts","sourceRoot":"","sources":["../../src/team/TeamService.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,UAAU,EAAE,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,QAAQ,EAAE,cAAc,EAAC,MAAM,+BAA+B,CAAC;AAExH,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAE9C,qBAAa,WAAW;IACV,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,EAAE,SAAS;IAE1C,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAIhE,UAAU,CAAC,QAAQ,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAIhD,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI3D,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAI/C,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;IAI1C,QAAQ,IAAI,OAAO,CAAC,aAAa,CAAC;IAIlC,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI7E,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAInE,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAInE,sBAAsB;CAG9B"}
+{"version":3,"file":"TeamService.d.ts","sourceRoot":"","sources":["../../src/team/TeamService.ts"],"names":[],"mappings":"AAmBA,OAAO,EACL,WAAW,EACX,UAAU,EACV,OAAO,EACP,WAAW,EACX,aAAa,EACb,QAAQ,EACR,cAAc,EACf,MAAM,+BAA+B,CAAC;AAEvC,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAE9C,qBAAa,WAAW;IACV,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,EAAE,SAAS;IAE1C,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAIhE,UAAU,CAAC,QAAQ,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAIhD,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI3D,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAI/C,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;IAI1C,QAAQ,IAAI,OAAO,CAAC,aAAa,CAAC;IAIlC,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI7E,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAInE,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAI1E,OAAO,CAAC,YAAY,CAA4B;IAChD,OAAO,CAAC,qBAAqB,CAAuB;IACpD,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAuB;IAC5C,sBAAsB;CAcpC"}

package/lib/team/TeamService.js

@@ -51,8 +51,18 @@ class TeamService {
     updateTeam(teamId, teamData) {
         return this.apiClient.api.teams.team.putTeam(teamId, teamData);
     }
-    getCommonFeatureConfig() {
-        return this.apiClient.api.teams.feature.getAllFeatures();
+    commonConfig = null;
+    commonConfigFetchedAt = null;
+    CACHE_DURATION_MS = 24 * 60 * 60 * 1000; // 24 hours
+    async getCommonFeatureConfig() {
+        const now = Date.now();
+        if (this.commonConfig == null ||
+            this.commonConfigFetchedAt == null ||
+            now - this.commonConfigFetchedAt > this.CACHE_DURATION_MS) {
+            this.commonConfig = await this.apiClient.api.teams.feature.getAllFeatures();
+            this.commonConfigFetchedAt = now;
+        }
+        return this.commonConfig;
     }
 }
 exports.TeamService = TeamService;

package/lib/test/StoreHelper.d.ts

@@ -0,0 +1,2 @@
+export declare function createMemoryEngine(storeName?: string): Promise<any>;
+//# sourceMappingURL=StoreHelper.d.ts.map

package/lib/test/StoreHelper.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"StoreHelper.d.ts","sourceRoot":"","sources":["../../src/test/StoreHelper.ts"],"names":[],"mappings":"AAqBA,wBAAsB,kBAAkB,CAAC,SAAS,SAAuB,gBAIxE"}