@wireapp/core 43.5.0 → 43.5.2

package/lib/Account.d.ts

@@ -14,7 +14,7 @@ import { GiphyService } from './giphy/';
 import { LinkPreviewService } from './linkPreview';
 import { MLSService } from './messagingProtocols/mls';
 import { AcmeChallenge, E2EIServiceExternal } from './messagingProtocols/mls/E2EIdentityService';
-import { CoreCallbacks, CoreCryptoConfig } from './messagingProtocols/mls/types';
+import { CoreCallbacks, CoreCryptoConfig, SecretCrypto } from './messagingProtocols/mls/types';
 import { NewClient, ProteusService } from './messagingProtocols/proteus';
 import { HandledEventPayload, NotificationService, NotificationSource } from './notification/';
 import { SelfService } from './self/';
@@ -39,10 +39,11 @@ export declare enum ConnectionState {
     /** The websocket is open and message will go through and notifications stream is fully processed */
     LIVE = "live"
 }
-export type CreateStoreFn = (storeName: string, context: Context) => undefined | Promise<CRUDEngine | undefined>;
+export type CreateStoreFn = (storeName: string, key: Uint8Array) => undefined | Promise<CRUDEngine | undefined>;
 interface AccountOptions {
     /** Used to store info in the database (will create a inMemory engine if returns undefined) */
     createStore?: CreateStoreFn;
+    systemCrypto?: SecretCrypto;
     /** Number of prekeys to generate when creating a new device (defaults to 2)
      * Prekeys are Diffie-Hellmann public keys which allow offline initiation of a secure Proteus session between two devices.
      * Having a high value will:
@@ -52,7 +53,7 @@ interface AccountOptions {
      *    - make creating a new device fast
      *    - make it likely that all prekeys get consumed while the device is offline and the last resort prekey will be used to create new session
      */
-    nbPrekeys?: number;
+    nbPrekeys: number;
     /**
      * Config for MLS and proteus devices. Will fallback to the old cryptobox logic if not provided
      */
@@ -66,16 +67,16 @@ type Events = {
     [EVENTS.NEW_SESSION]: NewClient;
 };
 export declare class Account extends TypedEventEmitter<Events> {
+    private options;
     private readonly apiClient;
     private readonly logger;
-    private readonly createStore;
-    private readonly nbPrekeys;
     private readonly coreCryptoConfig?;
     private readonly isMlsEnabled;
     /** this is the client the consumer is currently using. Will be set as soon as `initClient` is called and will be rest upon logout */
     private currentClient?;
     private storeEngine?;
     private db?;
+    private encryptedDb?;
     private coreCallbacks?;
     service?: {
         mls?: MLSService;
@@ -101,7 +102,7 @@ export declare class Account extends TypedEventEmitter<Events> {
      * @param apiClient The apiClient instance to use in the core (will create a new new one if undefined)
      * @param accountOptions
      */
-    constructor(apiClient?: APIClient, { createStore, nbPrekeys, coreCryptoConfig }?: AccountOptions);
+    constructor(apiClient?: APIClient, options?: AccountOptions);
     /**
      * Will set the APIClient to use a specific version of the API (by default uses version 0)
      * It will fetch the API Config and use the highest possible version
@@ -220,6 +221,7 @@ export declare class Account extends TypedEventEmitter<Events> {
     }): () => void;
     private generateDbName;
     private generateCoreDbName;
+    private generateEncryptedDbName;
     private initEngine;
     private groupIdFromConversationId;
 }

package/lib/Account.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Account.d.ts","sourceRoot":"","sources":["../src/Account.ts"],"names":[],"mappings":"AAmBA,OAAO,EACL,YAAY,EAGZ,OAAO,EACP,MAAM,EAEN,SAAS,EAEV,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAuB,UAAU,EAAE,gBAAgB,EAAC,MAAM,iCAAiC,CAAC;AAEnG,OAAO,KAAK,MAAM,MAAM,+BAA+B,CAAC;AASxD,OAAO,EAAC,SAAS,EAAE,eAAe,EAAC,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAC,iBAAiB,EAAC,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAC,UAAU,EAAe,MAAM,uBAAuB,CAAC;AAE/D,OAAO,EAAC,cAAc,EAAC,MAAM,YAAY,CAAC;AAE1C,OAAO,EAAC,gBAAgB,EAAC,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAC,UAAU,EAAE,aAAa,EAAC,MAAM,WAAW,CAAC;AACpD,OAAO,EAAC,iBAAiB,EAAC,MAAM,eAAe,CAAC;AAChD,OAAO,EAAC,YAAY,EAAE,mBAAmB,EAAC,MAAM,iBAAiB,CAAC;AAElE,OAAO,EAAC,sBAAsB,EAAC,MAAM,8DAA8D,CAAC;AACpG,OAAO,EAAC,YAAY,EAAC,MAAM,UAAU,CAAC;AACtC,OAAO,EAAC,kBAAkB,EAAC,MAAM,eAAe,CAAC;AACjD,OAAO,EAAC,UAAU,EAAC,MAAM,0BAA0B,CAAC;AACpD,OAAO,EAAC,aAAa,EAAE,mBAAmB,EAAO,MAAM,6CAA6C,CAAC;AACrG,OAAO,EAAC,aAAa,EAAE,gBAAgB,EAAC,MAAM,gCAAgC,CAAC;AAC/E,OAAO,EAAC,SAAS,EAAE,cAAc,EAAC,MAAM,8BAA8B,CAAC;AAEvE,OAAO,EAAC,mBAAmB,EAAE,mBAAmB,EAAE,kBAAkB,EAAC,MAAM,iBAAiB,CAAC;AAC7F,OAAO,EAAC,WAAW,EAAC,MAAM,SAAS,CAAC;AAEpC,OAAO,EAAC,WAAW,EAAC,MAAM,SAAS,CAAC;AACpC,OAAO,EAAC,WAAW,EAAC,MAAM,SAAS,CAAC;AACpC,OAAO,EAAC,sBAAsB,EAAC,MAAM,+BAA+B,CAAC;AAErE,MAAM,MAAM,qBAAqB,GAAG,mBAAmB,CAAC;AAExD,oBAAY,MAAM;IAChB;;;OAGG;IACH,WAAW,gBAAgB;CAC5B;AAED,oBAAY,eAAe;IACzB,8EAA8E;IAC9E,MAAM,WAAW;IACjB,oCAAoC;IACpC,UAAU,eAAe;IACzB,mFAAmF;IACnF,wBAAwB,6BAA6B;IACrD,oGAAoG;IACpG,IAAI,SAAS;CACd;AAED,MAAM,MAAM,aAAa,GAAG,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,KAAK,SAAS,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAAC;AAEjH,UAAU,cAAc;IACtB,8FAA8F;IAC9F,WAAW,CAAC,EAAE,aAAa,CAAC;IAE5B;;;;;;;;OAQG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;CACrC;AAED,KAAK,WAAW,GAAG;IACjB,2FAA2F;IAC3F,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAQF,KAAK,MAAM,GAAG;IACZ,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,SAAS,CAAC;CACjC,CAAC;AAEF,qBAAa,OAAQ,SAAQ,iBAAiB,CAAC,MAAM,CAAC;IACpD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAY;IACtC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAiB;IACxC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAgB;IAC5C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAmB;IACrD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAyB;IACtD,qIAAqI;IACrI,OAAO,CAAC,aAAa,CAAC,CAAmB;IACzC,OAAO,CAAC,WAAW,CAAC,CAAa;IACjC,OAAO,CAAC,EAAE,CAAC,CAAe;IAC1B,OAAO,CAAC,aAAa,CAAC,CAAgB;IAE/B,OAAO,CAAC,EAAE;QACf,GAAG,CAAC,EAAE,UAAU,CAAC;QACjB,WAAW,CAAC,EAAE,mBAAmB,CAAC;QAClC,OAAO,EAAE,cAAc,CAAC;QACxB,OAAO,EAAE,cAAc,CAAC;QACxB,KAAK,EAAE,YAAY,CAAC;QACpB,SAAS,EAAE,gBAAgB,CAAC;QAC5B,MAAM,EAAE,aAAa,CAAC;QACtB,UAAU,EAAE,iBAAiB,CAAC;QAC9B,YAAY,EAAE,mBAAmB,CAAC;QAClC,eAAe,EAAE,sBAAsB,CAAC;QACxC,KAAK,EAAE,YAAY,CAAC;QACpB,WAAW,EAAE,kBAAkB,CAAC;QAChC,YAAY,EAAE,mBAAmB,CAAC;QAClC,IAAI,EAAE,WAAW,CAAC;QAClB,IAAI,EAAE,WAAW,CAAC;QAClB,IAAI,EAAE,WAAW,CAAC;KACnB,CAAC;IACK,eAAe,EAAE,eAAe,CAAC;IACjC,sBAAsB,EAAE,sBAAsB,CAAC;IAEtD;;;OAGG;gBAED,SAAS,GAAE,SAA2B,EACtC,EAAC,WAA6B,EAAE,SAAe,EAAE,gBAAgB,EAAC,GAAE,cAAmB;IAsCzF;;;;;;;;;;;OAWG;IACU,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,OAAO;IAMvE,OAAO,CAAC,aAAa;YAKP,aAAa;IAUd,UAAU,CAAC,EACtB,WAAW,EACX,MAAM,EACN,YAAY,EACZ,YAAY,GACb,EAAE;QACD,WAAW,EAAE,MAAM,CAAC;QACpB,MAAM,EAAE,MAAM,CAAC;QACf,YAAY,EAAE,MAAM,CAAC;QACrB,YAAY,CAAC,EAAE,MAAM,CAAC;KACvB,GAAG,OAAO,CAAC,aAAa,GAAG,OAAO,CAAC;IA8BpC,IAAI,QAAQ,IAAI,MAAM,CAErB;IAED,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED;;;;;OAKG;IACU,QAAQ,CAAC,YAAY,EAAE,YAAY,EAAE,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC;IAM3F;;;;OAIG;IACU,IAAI,CAAC,UAAU,EAAE,UAAU,EAAE,EAAC,MAAM,EAAC,GAAE,WAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;IAMvF;;;;;OAKG;IACU,KAAK,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC;IAU1D;;OAEG;IACU,cAAc,CACzB,SAAS,EAAE,SAAS,EACpB,UAAU,GAAE,UAA8B,EAC1C,WAAW,CAAC,EAAE,UAAU,GACvB,OAAO,CAAC,gBAAgB,CAAC;IAuB5B;;OAEG;YACW,aAAa;IAU3B;;;;OAIG;IACU,UAAU,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAC/D,UAAU,IAAI,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;YAkClD,iBAAiB;IA2B/B;;;;;;OAMG;IACH,sBAAsB,CAAC,aAAa,EAAE,aAAa;IAItC,YAAY,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAsE1D,OAAO,CAAC,YAAY;IAMpB;;;OAGG;IACU,MAAM,CAAC,SAAS,GAAE,OAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAS9D;;OAEG;YACW,IAAI;IAOlB;;;;;;OAMG;IACI,MAAM,CAAC,EACZ,OAAkB,EAClB,wBAAmC,EACnC,4BAAuC,EACvC,qBAAgC,EAChC,MAAc,GACf,GAAE;QACD;;;;WAIG;QACH,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,mBAAmB,EAAE,MAAM,EAAE,kBAAkB,KAAK,IAAI,CAAC;QAE7E;;WAEG;QACH,4BAA4B,CAAC,EAAE,CAAC,EAAC,IAAI,EAAE,KAAK,EAAC,EAAE;YAAC,IAAI,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,MAAM,CAAA;SAAC,KAAK,IAAI,CAAC;QAEtF;;WAEG;QACH,wBAAwB,CAAC,EAAE,CAAC,KAAK,EAAE,eAAe,KAAK,IAAI,CAAC;QAE5D;;;;;;WAMG;QACH,qBAAqB,CAAC,EAAE,CAAC,cAAc,EAAE,MAAM,KAAK,IAAI,CAAC;QAEzD;;WAEG;QACH,MAAM,CAAC,EAAE,OAAO,CAAC;KACb,GAAG,MAAM,IAAI;IA2FnB,OAAO,CAAC,cAAc;IAKtB,OAAO,CAAC,kBAAkB;YAIZ,UAAU;IAsBxB,OAAO,CAAC,yBAAyB,CAS/B;CACH"}
+{"version":3,"file":"Account.d.ts","sourceRoot":"","sources":["../src/Account.ts"],"names":[],"mappings":"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"}

package/lib/Account.js

@@ -77,6 +77,8 @@ const E2EIdentityService_1 = require("./messagingProtocols/mls/E2EIdentityServic
 const proteus_1 = require("./messagingProtocols/proteus");
 const CryptoClient_1 = require("./messagingProtocols/proteus/ProteusService/CryptoClient");
 const notification_1 = require("./notification/");
+const encryptedStore_1 = require("./secretStore/encryptedStore");
+const secretKeyGenerator_1 = require("./secretStore/secretKeyGenerator");
 const self_1 = require("./self/");
 const CoreDB_1 = require("./storage/CoreDB");
 const team_2 = require("./team/");
@@ -111,8 +113,9 @@ class Account extends commons_1.TypedEventEmitter {
      * @param apiClient The apiClient instance to use in the core (will create a new new one if undefined)
      * @param accountOptions
      */
-    constructor(apiClient = new api_client_1.APIClient(), { createStore = () => undefined, nbPrekeys = 100, coreCryptoConfig } = {}) {
+    constructor(apiClient = new api_client_1.APIClient(), options = { nbPrekeys: 100 }) {
         super();
+        this.options = options;
         this.groupIdFromConversationId = async (conversationId, subconversationId) => {
             var _a, _b;
             if (!subconversationId) {
@@ -122,10 +125,8 @@ class Account extends commons_1.TypedEventEmitter {
         };
         this.apiClient = apiClient;
         this.backendFeatures = this.apiClient.backendFeatures;
-        this.coreCryptoConfig = coreCryptoConfig;
-        this.nbPrekeys = nbPrekeys;
+        this.coreCryptoConfig = options.coreCryptoConfig;
         this.isMlsEnabled = async () => { var _a; return !!((_a = this.coreCryptoConfig) === null || _a === void 0 ? void 0 : _a.mls) && (await this.apiClient.supportsMLS()); };
-        this.createStore = createStore;
         this.recurringTaskScheduler = new RecurringTaskScheduler_1.RecurringTaskScheduler({
             get: async (key) => {
                 var _a;
@@ -203,7 +204,7 @@ class Account extends commons_1.TypedEventEmitter {
             domain,
             id: this.userId,
         };
-        return this.service.mls.enrollE2EI(discoveryUrl, this.service.e2eIdentity, user, this.currentClient, this.nbPrekeys, oAuthIdToken);
+        return this.service.mls.enrollE2EI(discoveryUrl, this.service.e2eIdentity, user, this.currentClient, this.options.nbPrekeys, oAuthIdToken);
     }
     get clientId() {
         return this.apiClient.validatedClientId;
@@ -306,9 +307,9 @@ class Account extends commons_1.TypedEventEmitter {
         this.currentClient = validClient;
         return validClient;
     }
-    async buildCryptoClient(context, storeEngine) {
+    async buildCryptoClient(context, storeEngine, encryptedStore) {
         const baseConfig = {
-            nbPrekeys: this.nbPrekeys,
+            nbPrekeys: this.options.nbPrekeys,
             onNewPrekeys: async (prekeys) => {
                 this.logger.debug(`Received '${prekeys.length}' new PreKeys.`);
                 await this.apiClient.api.client.putClient(context.clientId, { prekeys });
@@ -318,11 +319,11 @@ class Account extends commons_1.TypedEventEmitter {
         const coreCryptoConfig = this.coreCryptoConfig;
         if (coreCryptoConfig) {
             const { buildClient } = await Promise.resolve().then(() => __importStar(require('./messagingProtocols/proteus/ProteusService/CryptoClient/CoreCryptoWrapper')));
-            const client = await buildClient(storeEngine, Object.assign(Object.assign(Object.assign({}, baseConfig), coreCryptoConfig), { generateSecretKey: keyId => coreCryptoConfig.generateSecretKey(storeEngine.storeName, keyId, 16) }));
+            const client = await buildClient(storeEngine, Object.assign(Object.assign(Object.assign({}, baseConfig), coreCryptoConfig), { generateSecretKey: keyId => (0, secretKeyGenerator_1.generateSecretKey)({ keyId, keySize: 16, secretsDb: encryptedStore }) }));
             return [CryptoClient_1.CryptoClientType.CORE_CRYPTO, client];
         }
         const { buildClient } = await Promise.resolve().then(() => __importStar(require('./messagingProtocols/proteus/ProteusService/CryptoClient/CryptoboxWrapper')));
-        const client = await buildClient(storeEngine, baseConfig);
+        const client = buildClient(storeEngine, baseConfig);
         return [CryptoClient_1.CryptoClientType.CRYPTOBOX, client];
     }
     /**
@@ -337,21 +338,25 @@ class Account extends commons_1.TypedEventEmitter {
     }
     async initServices(context) {
         var _a;
-        this.storeEngine = await this.initEngine(context);
+        const encryptedStoreName = this.generateEncryptedDbName(context);
+        this.encryptedDb = this.options.systemCrypto
+            ? await (0, encryptedStore_1.createCustomEncryptedStore)(encryptedStoreName, this.options.systemCrypto)
+            : await (0, encryptedStore_1.createEncryptedStore)(encryptedStoreName);
         this.db = await (0, CoreDB_1.openDB)(this.generateCoreDbName(context));
+        this.storeEngine = await this.initEngine(context, this.encryptedDb);
         const accountService = new account_1.AccountService(this.apiClient);
         const assetService = new conversation_1.AssetService(this.apiClient);
-        const [clientType, cryptoClient] = await this.buildCryptoClient(context, this.storeEngine);
+        const [clientType, cryptoClient] = await this.buildCryptoClient(context, this.storeEngine, this.encryptedDb);
         let mlsService;
         let e2eServiceExternal;
         const proteusService = new proteus_1.ProteusService(this.apiClient, cryptoClient, {
             onNewClient: payload => this.emit(EVENTS.NEW_SESSION, payload),
-            nbPrekeys: this.nbPrekeys,
+            nbPrekeys: this.options.nbPrekeys,
         });
         const clientService = new client_2.ClientService(this.apiClient, proteusService, this.storeEngine);
         if (clientType === CryptoClient_1.CryptoClientType.CORE_CRYPTO && (await this.isMlsEnabled())) {
-            e2eServiceExternal = new E2EIdentityService_1.E2EIServiceExternal(cryptoClient.getNativeClient(), clientService);
             mlsService = new mls_1.MLSService(this.apiClient, cryptoClient.getNativeClient(), this.db, this.recurringTaskScheduler, Object.assign({}, (_a = this.coreCryptoConfig) === null || _a === void 0 ? void 0 : _a.mls));
+            e2eServiceExternal = new E2EIdentityService_1.E2EIServiceExternal(cryptoClient.getNativeClient(), clientService, mlsService.config.cipherSuite);
         }
         const connectionService = new connection_1.ConnectionService(this.apiClient);
         const giphyService = new giphy_1.GiphyService(this.apiClient);
@@ -392,8 +397,9 @@ class Account extends commons_1.TypedEventEmitter {
      * @param clearData if set to `true` will completely wipe any database that was created by the Account
      */
     async logout(clearData = false) {
-        var _a;
+        var _a, _b;
         (_a = this.db) === null || _a === void 0 ? void 0 : _a.close();
+        (_b = this.encryptedDb) === null || _b === void 0 ? void 0 : _b.close();
         if (clearData) {
             await this.wipe();
         }
@@ -404,11 +410,12 @@ class Account extends commons_1.TypedEventEmitter {
      * Will delete the identity of the current user
      */
     async wipe() {
-        var _a;
+        var _a, _b;
         await ((_a = this.service) === null || _a === void 0 ? void 0 : _a.proteus.wipe(this.storeEngine));
         if (this.db) {
             await (0, CoreDB_1.deleteDB)(this.db);
         }
+        await ((_b = this.encryptedDb) === null || _b === void 0 ? void 0 : _b.wipe());
     }
     /**
      * Will download and handle the notification stream since last stored notification id.
@@ -512,11 +519,16 @@ class Account extends commons_1.TypedEventEmitter {
     generateCoreDbName(context) {
         return `core-${this.generateDbName(context)}`;
     }
-    async initEngine(context) {
+    generateEncryptedDbName(context) {
+        return `secrets-${this.generateDbName(context)}`;
+    }
+    async initEngine(context, encryptedStore) {
         const dbName = this.generateDbName(context);
         this.logger.log(`Initialising store with name "${dbName}"...`);
         const openDb = async () => {
-            const initializedDb = await this.createStore(dbName, context);
+            var _a, _b;
+            const dbKey = await (0, secretKeyGenerator_1.generateSecretKey)({ keyId: 'db-key', keySize: 32, secretsDb: encryptedStore });
+            const initializedDb = await ((_b = (_a = this.options).createStore) === null || _b === void 0 ? void 0 : _b.call(_a, dbName, dbKey.key));
             if (initializedDb) {
                 this.logger.info(`Initialized store with existing engine "${dbName}".`);
                 return initializedDb;

package/lib/Account.test.js

@@ -98,7 +98,7 @@ const waitFor = (assertion) => {
 describe('Account', () => {
     const CLIENT_ID = '4e37b32f57f6da55';
     // Fix for node 16, crypto.subtle.decrypt has a type problem
-    jest.spyOn(global.crypto.subtle, 'decrypt').mockImplementation();
+    jest.spyOn(global.crypto.subtle, 'decrypt').mockResolvedValue(new Uint8Array(32));
     const accessTokenData = {
         access_token: 'iJCRCjc8oROO-dkrkqCXOade997oa8Jhbz6awMUQPBQo80VenWqp_oNvfY6AnU5BxEsdDPOBfBP-uz_b0gAKBQ==.v=1.k=1.d=1498600993.t=a.l=.u=aaf9a833-ef30-4c22-86a0-9adc8a15b3b4.c=15037015562284012115',
         expires_in: 900,
@@ -234,7 +234,7 @@ describe('Account', () => {
                     event: { type: event_1.CONVERSATION_EVENT.OTR_MESSAGE_ADD },
                 },
             });
-            const kill = await account.listen({
+            const kill = account.listen({
                 onEvent: ({ event }) => {
                     expect(event.type).toBe(event_1.CONVERSATION_EVENT.OTR_MESSAGE_ADD);
                     resolve();

package/lib/messagingProtocols/mls/E2EIdentityService/E2EIServiceExternal.d.ts

@@ -8,11 +8,12 @@ export type DeviceIdentity = Omit<WireIdentity, 'free' | 'status'> & {
 export declare class E2EIServiceExternal {
     private readonly coreCryptoClient;
     private readonly clientService;
-    constructor(coreCryptoClient: CoreCrypto, clientService: ClientService);
+    private readonly cipherSuite;
+    constructor(coreCryptoClient: CoreCrypto, clientService: ClientService, cipherSuite: Ciphersuite);
     isEnrollmentInProgress(): boolean;
     clearAllProgress(): void;
     getConversationState(conversationId: Uint8Array): Promise<E2eiConversationState>;
-    isE2EIEnabled(ciphersuite: Ciphersuite): Promise<boolean>;
+    isE2EIEnabled(): Promise<boolean>;
     getUsersIdentities(groupId: string, userIds: QualifiedId[]): Promise<Map<string, DeviceIdentity[]>>;
     getDevicesIdentities(groupId: string, userClientsMap: Record<string, QualifiedId>): Promise<DeviceIdentity[]>;
     isFreshMLSSelfClient(): Promise<boolean>;

package/lib/messagingProtocols/mls/E2EIdentityService/E2EIServiceExternal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"E2EIServiceExternal.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/mls/E2EIdentityService/E2EIServiceExternal.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AAGzD,OAAO,EAAC,WAAW,EAAE,UAAU,EAAE,qBAAqB,EAAE,YAAY,EAAE,YAAY,EAAC,MAAM,sBAAsB,CAAC;AAKhH,OAAO,EAAC,aAAa,EAAC,MAAM,iBAAiB,CAAC;AAG9C,MAAM,MAAM,cAAc,GAAG,IAAI,CAAC,YAAY,EAAE,MAAM,GAAG,QAAQ,CAAC,GAAG;IAAC,MAAM,CAAC,EAAE,YAAY,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAC,CAAC;AAG/G,qBAAa,mBAAmB;IAE5B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,aAAa;gBADb,gBAAgB,EAAE,UAAU,EAC5B,aAAa,EAAE,aAAa;IAIxC,sBAAsB,IAAI,OAAO;IAIjC,gBAAgB,IAAI,IAAI;IAIxB,oBAAoB,CAAC,cAAc,EAAE,UAAU,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAIhF,aAAa,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC;IAInD,kBAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,cAAc,EAAE,CAAC,CAAC;IA6CnG,oBAAoB,CAC/B,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GAC1C,OAAO,CAAC,cAAc,EAAE,CAAC;IAef,oBAAoB,IAAI,OAAO,CAAC,OAAO,CAAC;CAOtD"}
+{"version":3,"file":"E2EIServiceExternal.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/mls/E2EIdentityService/E2EIServiceExternal.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AAGzD,OAAO,EAAC,WAAW,EAAE,UAAU,EAAE,qBAAqB,EAAE,YAAY,EAAE,YAAY,EAAC,MAAM,sBAAsB,CAAC;AAKhH,OAAO,EAAC,aAAa,EAAC,MAAM,iBAAiB,CAAC;AAG9C,MAAM,MAAM,cAAc,GAAG,IAAI,CAAC,YAAY,EAAE,MAAM,GAAG,QAAQ,CAAC,GAAG;IAAC,MAAM,CAAC,EAAE,YAAY,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAC,CAAC;AAG/G,qBAAa,mBAAmB;IAE5B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,WAAW;gBAFX,gBAAgB,EAAE,UAAU,EAC5B,aAAa,EAAE,aAAa,EAC5B,WAAW,EAAE,WAAW;IAIpC,sBAAsB,IAAI,OAAO;IAIjC,gBAAgB,IAAI,IAAI;IAIxB,oBAAoB,CAAC,cAAc,EAAE,UAAU,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAIhF,aAAa,IAAI,OAAO,CAAC,OAAO,CAAC;IAI3B,kBAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,cAAc,EAAE,CAAC,CAAC;IA6CnG,oBAAoB,CAC/B,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GAC1C,OAAO,CAAC,cAAc,EAAE,CAAC;IAef,oBAAoB,IAAI,OAAO,CAAC,OAAO,CAAC;CAOtD"}

package/lib/messagingProtocols/mls/E2EIdentityService/E2EIServiceExternal.js

@@ -25,9 +25,10 @@ const E2EIStorage_1 = require("./Storage/E2EIStorage");
 const fullyQualifiedClientIdUtils_1 = require("../../../util/fullyQualifiedClientIdUtils");
 // This export is meant to be accessible from the outside (e.g the Webapp / UI)
 class E2EIServiceExternal {
-    constructor(coreCryptoClient, clientService) {
+    constructor(coreCryptoClient, clientService, cipherSuite) {
         this.coreCryptoClient = coreCryptoClient;
         this.clientService = clientService;
+        this.cipherSuite = cipherSuite;
     }
     // If we have a handle in the local storage, we are in the enrollment process (this handle is saved before oauth redirect)
     isEnrollmentInProgress() {
@@ -39,8 +40,8 @@ class E2EIServiceExternal {
     getConversationState(conversationId) {
         return this.coreCryptoClient.e2eiConversationState(conversationId);
     }
-    isE2EIEnabled(ciphersuite) {
-        return this.coreCryptoClient.e2eiIsEnabled(ciphersuite);
+    isE2EIEnabled() {
+        return this.coreCryptoClient.e2eiIsEnabled(this.cipherSuite);
     }
     async getUsersIdentities(groupId, userIds) {
         const groupIdBytes = bazinga64_1.Decoder.fromBase64(groupId).asBytes;

package/lib/messagingProtocols/mls/E2EIdentityService/E2EIServiceExternal.test.js

@@ -18,6 +18,7 @@
  *
  */
 Object.defineProperty(exports, "__esModule", { value: true });
+const core_crypto_1 = require("@wireapp/core-crypto");
 const E2EIServiceExternal_1 = require("./E2EIServiceExternal");
 const PayloadHelper_1 = require("../../../test/PayloadHelper");
 function buildE2EIService() {
@@ -26,7 +27,10 @@ function buildE2EIService() {
         getClientIds: jest.fn().mockResolvedValue([]),
     };
     const clientService = {};
-    return [new E2EIServiceExternal_1.E2EIServiceExternal(coreCrypto, clientService), { coreCrypto }];
+    return [
+        new E2EIServiceExternal_1.E2EIServiceExternal(coreCrypto, clientService, core_crypto_1.Ciphersuite.MLS_128_DHKEMP256_AES128GCM_SHA256_P256),
+        { coreCrypto },
+    ];
 }
 function generateCoreCryptoIdentity({ userId, status = 'Valid', deviceId = (0, PayloadHelper_1.getUUID)(), }) {
     return {

package/lib/messagingProtocols/mls/types.d.ts

@@ -1,15 +1,9 @@
 import { QualifiedId } from '@wireapp/api-client/lib/user';
 import { MLSServiceConfig } from './MLSService/MLSService.types';
-import { GeneratedKey } from '../../secretStore/secretKeyGenerator';
 export type ClientId = string;
 export type SecretCrypto = {
     encrypt: (value: Uint8Array) => Promise<Uint8Array>;
     decrypt: (payload: Uint8Array) => Promise<Uint8Array>;
-    version: undefined;
-} | {
-    encrypt: (value: string) => Promise<Uint8Array>;
-    decrypt: (payload: Uint8Array) => Promise<string>;
-    version: 1;
 };
 export interface CoreCallbacks {
     /**
@@ -31,10 +25,6 @@ export type CommitPendingProposalsParams = {
     skipDelete?: boolean;
 } & CommonMLS;
 export interface CoreCryptoConfig {
-    /**
-     * function called to generate the secret key for CoreCrypto's database encryption
-     */
-    generateSecretKey: (storeName: string, keyId: string, keySize: number) => Promise<GeneratedKey>;
     /**
      * path on the public server to the core crypto wasm file.
      * This file will be downloaded lazily when corecrypto is needed.

package/lib/messagingProtocols/mls/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/messagingProtocols/mls/types.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AAEzD,OAAO,EAAC,gBAAgB,EAAC,MAAM,+BAA+B,CAAC;AAE/D,OAAO,EAAC,YAAY,EAAC,MAAM,sCAAsC,CAAC;AAElE,MAAM,MAAM,QAAQ,GAAG,MAAM,CAAC;AAE9B,MAAM,MAAM,YAAY,GACpB;IACE,OAAO,EAAE,CAAC,KAAK,EAAE,UAAU,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC;IACpD,OAAO,EAAE,CAAC,OAAO,EAAE,UAAU,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC;IACtD,OAAO,EAAE,SAAS,CAAC;CACpB,GACD;IACE,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC;IAChD,OAAO,EAAE,CAAC,OAAO,EAAE,UAAU,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAClD,OAAO,EAAE,CAAC,CAAC;CACZ,CAAC;AAEN,MAAM,WAAW,aAAa;IAC5B;;;;;OAKG;IACH,yBAAyB,EAAE,CAAC,cAAc,EAAE,WAAW,KAAK,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;CACzF;AAED,MAAM,MAAM,SAAS,GAAG;IACtB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,4BAA4B,GAAG;IACzC,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACnB,GAAG,SAAS,CAAC;AAEd,MAAM,MAAM,4BAA4B,GAAG;IACzC,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB,GAAG,SAAS,CAAC;AAEd,MAAM,WAAW,gBAAgB;IAC/B;;OAEG;IACH,iBAAiB,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,YAAY,CAAC,CAAC;IAEhG;;;;OAIG;IACH,YAAY,EAAE,MAAM,CAAC;IAErB,uEAAuE;IACvE,GAAG,CAAC,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC;CACjC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/messagingProtocols/mls/types.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AAEzD,OAAO,EAAC,gBAAgB,EAAC,MAAM,+BAA+B,CAAC;AAE/D,MAAM,MAAM,QAAQ,GAAG,MAAM,CAAC;AAE9B,MAAM,MAAM,YAAY,GAAG;IACzB,OAAO,EAAE,CAAC,KAAK,EAAE,UAAU,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC;IACpD,OAAO,EAAE,CAAC,OAAO,EAAE,UAAU,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC;CACvD,CAAC;AAEF,MAAM,WAAW,aAAa;IAC5B;;;;;OAKG;IACH,yBAAyB,EAAE,CAAC,cAAc,EAAE,WAAW,KAAK,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;CACzF;AAED,MAAM,MAAM,SAAS,GAAG;IACtB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,4BAA4B,GAAG;IACzC,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACnB,GAAG,SAAS,CAAC;AAEd,MAAM,MAAM,4BAA4B,GAAG;IACzC,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB,GAAG,SAAS,CAAC;AAEd,MAAM,WAAW,gBAAgB;IAC/B;;;;OAIG;IACH,YAAY,EAAE,MAAM,CAAC;IAErB,uEAAuE;IACvE,GAAG,CAAC,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC;CACjC"}

package/lib/secretStore/encryptedStore.d.ts

@@ -19,7 +19,7 @@ type EncryptedStoreConfig<EncryptedPayload> = {
     encrypt: EncryptFn<EncryptedPayload>;
     decrypt: DecryptFn<EncryptedPayload>;
 };
-export declare class EncryptedStore<EncryptedPayload> {
+export declare class EncryptedStore<EncryptedPayload = unknown> {
     #private;
     private readonly db;
     constructor(db: IDBPDatabase<EncryptedDB<EncryptedPayload>>, { encrypt, decrypt }: EncryptedStoreConfig<EncryptedPayload>);

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

@@ -1 +1 @@
-{"version":3,"file":"encryptedStore.d.ts","sourceRoot":"","sources":["../../src/secretStore/encryptedStore.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,QAAQ,EAAE,YAAY,EAAmB,MAAM,KAAK,CAAC;AAE7D,UAAU,uBAAuB;IAC/B,EAAE,EAAE,UAAU,GAAG,WAAW,CAAC;IAC7B,KAAK,EAAE,UAAU,GAAG,WAAW,CAAC;CACjC;AACD,UAAU,WAAW,CAAC,gBAAgB,CAAE,SAAQ,QAAQ;IACtD,GAAG,EAAE;QACH,GAAG,EAAE,MAAM,CAAC;QACZ,KAAK,EAAE,SAAS,CAAC;KAClB,CAAC;IACF,OAAO,EAAE;QACP,GAAG,EAAE,MAAM,CAAC;QACZ,KAAK,EAAE,gBAAgB,CAAC;KACzB,CAAC;CACH;AAED,KAAK,SAAS,CAAC,gBAAgB,IAAI,CAAC,OAAO,EAAE,gBAAgB,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC;AACtF,KAAK,SAAS,CAAC,gBAAgB,IAAI,CAAC,KAAK,EAAE,UAAU,KAAK,OAAO,CAAC,gBAAgB,CAAC,CAAC;AAEpF,KAAK,oBAAoB,CAAC,gBAAgB,IAAI;IAC5C,OAAO,EAAE,SAAS,CAAC,gBAAgB,CAAC,CAAC;IACrC,OAAO,EAAE,SAAS,CAAC,gBAAgB,CAAC,CAAC;CACtC,CAAC;AAEF,qBAAa,cAAc,CAAC,gBAAgB;;IAIxC,OAAO,CAAC,QAAQ,CAAC,EAAE;gBAAF,EAAE,EAAE,YAAY,CAAC,WAAW,CAAC,gBAAgB,CAAC,CAAC,EAChE,EAAC,OAAO,EAAE,OAAO,EAAC,EAAE,oBAAoB,CAAC,gBAAgB,CAAC;IAMtD,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU;IAKrD,cAAc,CAAC,UAAU,EAAE,MAAM;IAQjC,iBAAiB,CAAC,UAAU,EAAE,MAAM;IAM1C,KAAK;IAIC,IAAI;CAIX;AAuBD;;;;;GAKG;AACH,wBAAsB,oBAAoB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,uBAAuB,CAAC,CAAC,CAkB3G;AAED;;;;;;GAMG;AACH,wBAAsB,0BAA0B,CAAC,gBAAgB,EAC/D,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,oBAAoB,CAAC,gBAAgB,CAAC,GAC7C,OAAO,CAAC,cAAc,CAAC,gBAAgB,CAAC,CAAC,CAQ3C"}
+{"version":3,"file":"encryptedStore.d.ts","sourceRoot":"","sources":["../../src/secretStore/encryptedStore.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,QAAQ,EAAE,YAAY,EAAmB,MAAM,KAAK,CAAC;AAE7D,UAAU,uBAAuB;IAC/B,EAAE,EAAE,UAAU,GAAG,WAAW,CAAC;IAC7B,KAAK,EAAE,UAAU,GAAG,WAAW,CAAC;CACjC;AACD,UAAU,WAAW,CAAC,gBAAgB,CAAE,SAAQ,QAAQ;IACtD,GAAG,EAAE;QACH,GAAG,EAAE,MAAM,CAAC;QACZ,KAAK,EAAE,SAAS,CAAC;KAClB,CAAC;IACF,OAAO,EAAE;QACP,GAAG,EAAE,MAAM,CAAC;QACZ,KAAK,EAAE,gBAAgB,CAAC;KACzB,CAAC;CACH;AAED,KAAK,SAAS,CAAC,gBAAgB,IAAI,CAAC,OAAO,EAAE,gBAAgB,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC;AACtF,KAAK,SAAS,CAAC,gBAAgB,IAAI,CAAC,KAAK,EAAE,UAAU,KAAK,OAAO,CAAC,gBAAgB,CAAC,CAAC;AAEpF,KAAK,oBAAoB,CAAC,gBAAgB,IAAI;IAC5C,OAAO,EAAE,SAAS,CAAC,gBAAgB,CAAC,CAAC;IACrC,OAAO,EAAE,SAAS,CAAC,gBAAgB,CAAC,CAAC;CACtC,CAAC;AAEF,qBAAa,cAAc,CAAC,gBAAgB,GAAG,OAAO;;IAIlD,OAAO,CAAC,QAAQ,CAAC,EAAE;gBAAF,EAAE,EAAE,YAAY,CAAC,WAAW,CAAC,gBAAgB,CAAC,CAAC,EAChE,EAAC,OAAO,EAAE,OAAO,EAAC,EAAE,oBAAoB,CAAC,gBAAgB,CAAC;IAMtD,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU;IAKrD,cAAc,CAAC,UAAU,EAAE,MAAM;IAQjC,iBAAiB,CAAC,UAAU,EAAE,MAAM;IAM1C,KAAK;IAIC,IAAI;CAIX;AAuBD;;;;;GAKG;AACH,wBAAsB,oBAAoB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,uBAAuB,CAAC,CAAC,CAkB3G;AAED;;;;;;GAMG;AACH,wBAAsB,0BAA0B,CAAC,gBAAgB,EAC/D,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,oBAAoB,CAAC,gBAAgB,CAAC,GAC7C,OAAO,CAAC,cAAc,CAAC,gBAAgB,CAAC,CAAC,CAQ3C"}

package/lib/secretStore/encryptedStore.js

@@ -75,7 +75,7 @@ async function defaultDecrypt({ value, iv }, key) {
     return new Uint8Array(decrypted);
 }
 async function defaultEncrypt(data, key) {
-    const iv = await crypto.getRandomValues(new Uint8Array(12));
+    const iv = crypto.getRandomValues(new Uint8Array(12));
     return {
         iv,
         value: await crypto.subtle.encrypt({ name: 'AES-GCM', iv }, key, data),

package/lib/secretStore/secretKeyGenerator.d.ts

@@ -1,4 +1,4 @@
-import { SecretCrypto } from '../messagingProtocols/mls/types';
+import { EncryptedStore } from './encryptedStore';
 export declare class CorruptedKeyError extends Error {
 }
 export type GeneratedKey = {
@@ -8,14 +8,12 @@ export type GeneratedKey = {
 /**
  * Will generate (or retrieve) a secret key from the database.
  */
-export declare function generateSecretKey({ keyId, keySize, dbName, systemCrypto: baseCrypto, }: {
+export declare function generateSecretKey({ keyId, keySize, secretsDb, }: {
     /** the ID of the key to generate (if the ID already exists, then the generated key will be returned) */
     keyId: string;
     /** size of the key to generate */
     keySize?: number;
     /** name of the database that will hold the secrets */
-    dbName: string;
-    /** custom crypto primitives to use to encrypt the secret keys */
-    systemCrypto?: SecretCrypto;
+    secretsDb: EncryptedStore<any>;
 }): Promise<GeneratedKey>;
 //# sourceMappingURL=secretKeyGenerator.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"secretKeyGenerator.d.ts","sourceRoot":"","sources":["../../src/secretStore/secretKeyGenerator.ts"],"names":[],"mappings":"AAuBA,OAAO,EAAC,YAAY,EAAC,MAAM,iCAAiC,CAAC;AAI7D,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,MAAM,EACN,YAAY,EAAE,UAAU,GACzB,EAAE;IACD,wGAAwG;IACxG,KAAK,EAAE,MAAM,CAAC;IACd,kCAAkC;IAClC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,sDAAsD;IACtD,MAAM,EAAE,MAAM,CAAC;IACf,iEAAiE;IACjE,YAAY,CAAC,EAAE,YAAY,CAAC;CAC7B,GAAG,OAAO,CAAC,YAAY,CAAC,CAwDxB"}
+{"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,CAsBxB"}

package/lib/secretStore/secretKeyGenerator.js

@@ -19,44 +19,13 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateSecretKey = exports.CorruptedKeyError = void 0;
-const bazinga64_1 = require("bazinga64");
-const encryptedStore_1 = require("./encryptedStore");
-const isBase64 = /^([A-Za-z0-9+/]{4})*([A-Za-z0-9+/]{3}=|[A-Za-z0-9+/]{2}==)?$/;
 class CorruptedKeyError extends Error {
 }
 exports.CorruptedKeyError = CorruptedKeyError;
 /**
  * Will generate (or retrieve) a secret key from the database.
  */
-async function generateSecretKey({ keyId, keySize = 16, dbName, systemCrypto: baseCrypto, }) {
-    const systemCrypto = baseCrypto
-        ? {
-            encrypt: (value) => {
-                if (baseCrypto.version === 1) {
-                    const strValue = bazinga64_1.Encoder.toBase64(value).asString;
-                    return baseCrypto.encrypt(strValue);
-                }
-                // In previous versions of the systemCrypto (prior to February 2023), encrypt took a uint8Array
-                return baseCrypto.encrypt(value);
-            },
-            decrypt: async (value) => {
-                if (typeof baseCrypto.version === 'undefined') {
-                    // In previous versions of the systemCrypto (prior to February 2023), the decrypt function returned a Uint8Array
-                    return baseCrypto.decrypt(value);
-                }
-                const decrypted = await baseCrypto.decrypt(value);
-                if (isBase64.test(decrypted)) {
-                    return bazinga64_1.Decoder.fromBase64(decrypted).asBytes;
-                }
-                // Between June 2022 and October 2022, the systemCrypto returned a string encoded in UTF-8
-                const encoder = new TextEncoder();
-                return encoder.encode(decrypted);
-            },
-        }
-        : undefined;
-    const secretsDb = systemCrypto
-        ? await (0, encryptedStore_1.createCustomEncryptedStore)(dbName, systemCrypto)
-        : await (0, encryptedStore_1.createEncryptedStore)(dbName);
+async function generateSecretKey({ keyId, keySize = 16, secretsDb, }) {
     try {
         let key;
         try {
@@ -75,11 +44,9 @@ async function generateSecretKey({ keyId, keySize = 16, dbName, systemCrypto: ba
             key = crypto.getRandomValues(new Uint8Array(keySize));
             await secretsDb.saveSecretValue(keyId, key);
         }
-        await (secretsDb === null || secretsDb === void 0 ? void 0 : secretsDb.close());
         return { key, deleteKey: () => secretsDb.deleteSecretValue(keyId) };
     }
     catch (error) {
-        await (secretsDb === null || secretsDb === void 0 ? void 0 : secretsDb.close());
         throw error;
     }
 }

package/lib/secretStore/secretKeyGenerator.test.js

@@ -18,105 +18,39 @@
  *
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-const bazinga64_1 = require("bazinga64");
+const encryptedStore_1 = require("./encryptedStore");
 const secretKeyGenerator_1 = require("./secretKeyGenerator");
-const systemCryptos = {
-    v0: {
-        encrypt: async (value) => {
-            return value;
-        },
-        decrypt: async (value) => {
-            return value;
-        },
-        version: undefined,
-    },
-    v01: {
-        encrypt: async (value) => {
-            return bazinga64_1.Encoder.toBase64(value).asBytes;
-        },
-        decrypt: async (value) => {
-            const str = new TextDecoder().decode(value);
-            return bazinga64_1.Decoder.fromBase64(str).asBytes;
-        },
-        version: undefined,
-    },
-    v1: {
-        encrypt: async (value) => {
-            const encoder = new TextEncoder();
-            return encoder.encode(value);
-        },
-        decrypt: async (value) => {
-            const decoder = new TextDecoder();
-            return decoder.decode(value);
-        },
-        version: 1,
-    },
+const customCrypto = {
+    encrypt: async (value) => value,
+    decrypt: async (value) => value,
+    version: 1,
 };
 const dbName = 'test';
 const keyId = 'test-key';
 describe('SecretKeyGenerator', () => {
-    beforeEach(async () => {
-        return new Promise(resolve => {
-            Object.values(systemCryptos).forEach(version => {
-                jest.spyOn(version, 'encrypt');
-                jest.spyOn(version, 'decrypt');
-            });
-            const deleteReq = indexedDB.deleteDatabase(dbName);
-            deleteReq.onsuccess = resolve;
-        });
+    let secretsDb;
+    afterEach(async () => {
+        await (secretsDb === null || secretsDb === void 0 ? void 0 : secretsDb.wipe());
     });
-    it('generates and store a secret key stored in indexeddb', async () => {
-        const { key: secretKey } = await (0, secretKeyGenerator_1.generateSecretKey)({ dbName, keyId });
+    it('generates store and deletes a secret key stored in indexeddb', async () => {
+        secretsDb = await (0, encryptedStore_1.createEncryptedStore)(dbName);
+        const { key: secretKey } = await (0, secretKeyGenerator_1.generateSecretKey)({ secretsDb, keyId });
         expect(secretKey).toBeDefined();
-        const { key: secretKey2 } = await (0, secretKeyGenerator_1.generateSecretKey)({ dbName, keyId });
+        const { key: secretKey2 } = await (0, secretKeyGenerator_1.generateSecretKey)({ secretsDb, keyId });
         expect(secretKey).toEqual(secretKey2);
     });
-    it.each(Object.entries(systemCryptos))('generates and store a secret key encrypted using system crypto (%s)', async (_name, systemCrypto) => {
-        const { key } = await (0, secretKeyGenerator_1.generateSecretKey)({
-            dbName,
-            systemCrypto,
-            keyId,
-        });
-        expect(key).toBeDefined();
-        expect(systemCrypto.encrypt).toHaveBeenCalled();
-        expect(systemCrypto.decrypt).not.toHaveBeenCalled();
-        // fetch stored key
-        const { key: key2 } = await (0, secretKeyGenerator_1.generateSecretKey)({ dbName, systemCrypto: systemCrypto, keyId });
-        expect(key2).toEqual(key);
-        expect(systemCrypto.encrypt).toHaveBeenCalledTimes(1);
-        expect(systemCrypto.decrypt).toHaveBeenCalledTimes(1);
-    });
-    it.each([
-        ['v0 > v01', systemCryptos.v0, systemCryptos.v01],
-        ['v0 > v1', systemCryptos.v0, systemCryptos.v1],
-    ])('throws an error if previous systemCrypto is not compatible with the current one (%s)', async (_name, crypto1, crypto2) => {
-        const { key } = await (0, secretKeyGenerator_1.generateSecretKey)({
-            dbName,
-            systemCrypto: crypto1,
-            keyId,
-        });
-        expect(key).toBeDefined();
-        try {
-            await (0, secretKeyGenerator_1.generateSecretKey)({ dbName, systemCrypto: crypto2, keyId });
-        }
-        catch (e) {
-            expect(e).toBeInstanceOf(secretKeyGenerator_1.CorruptedKeyError);
-        }
-    });
     it('deletes the key from DB', async () => {
-        const { key, deleteKey } = await (0, secretKeyGenerator_1.generateSecretKey)({ dbName, keyId });
+        secretsDb = await (0, encryptedStore_1.createEncryptedStore)(dbName);
+        const { key, deleteKey } = await (0, secretKeyGenerator_1.generateSecretKey)({ secretsDb, keyId });
         await deleteKey();
-        const { key: secondKey } = await (0, secretKeyGenerator_1.generateSecretKey)({ dbName: 'test', keyId });
+        const { key: secondKey } = await (0, secretKeyGenerator_1.generateSecretKey)({ secretsDb, keyId });
         expect(key).not.toEqual(secondKey);
     });
-    it.each([['v01 > v1', systemCryptos.v01, systemCryptos.v1]])('is able to read a key that was generated with a previous system crypto (%s)', async (_name, crypto1, crypto2) => {
-        const { key } = await (0, secretKeyGenerator_1.generateSecretKey)({
-            dbName: 'test',
-            systemCrypto: crypto1,
-            keyId,
-        });
+    it('creates a new key from a custom encryption store', async () => {
+        secretsDb = await (0, encryptedStore_1.createCustomEncryptedStore)(dbName, customCrypto);
+        const { key } = await (0, secretKeyGenerator_1.generateSecretKey)({ secretsDb, keyId });
         expect(key).toBeDefined();
-        const { key: key2 } = await (0, secretKeyGenerator_1.generateSecretKey)({ dbName: 'test', systemCrypto: crypto2, keyId });
+        const { key: key2 } = await (0, secretKeyGenerator_1.generateSecretKey)({ secretsDb, keyId });
         expect(key2).toEqual(key);
     });
 });

package/package.json

@@ -11,7 +11,7 @@
     "./lib/cryptography/AssetCryptography/crypto.node": "./lib/cryptography/AssetCryptography/crypto.browser.js"
   },
   "dependencies": {
-    "@wireapp/api-client": "^26.8.1",
+    "@wireapp/api-client": "^26.8.2",
     "@wireapp/commons": "^5.2.4",
     "@wireapp/core-crypto": "1.0.0-rc.21",
     "@wireapp/cryptobox": "12.8.0",
@@ -19,7 +19,7 @@
     "@wireapp/protocol-messaging": "1.44.0",
     "@wireapp/store-engine": "5.1.5",
     "@wireapp/store-engine-dexie": "^2.1.7",
-    "axios": "1.6.3",
+    "axios": "1.6.5",
     "bazinga64": "^6.3.4",
     "deepmerge-ts": "5.1.0",
     "hash.js": "1.1.7",
@@ -61,6 +61,6 @@
     "test:coverage": "jest --coverage",
     "watch": "tsc --watch"
   },
-  "version": "43.5.0",
-  "gitHead": "382e13a63b212bdc79b77f702b32e607c2122943"
+  "version": "43.5.2",
+  "gitHead": "057e4698deef64120e04d08339783f8e7445e1ac"
 }