@wireapp/core 46.28.0 → 46.29.1

package/lib/messagingProtocols/proteus/ProteusService/CryptoClient/CoreCryptoWrapper/CoreCryptoWrapper.js

@@ -50,24 +50,23 @@ const migrateOnceAndGetKey = async (generateSecretKey, coreCryptoDbName) => {
     const keyOld = await getKey(generateSecretKey, coreCryptoKeyId, 16);
     // We retrieve the new key if it exists or generate a new one
     const keyNew = await getKey(generateSecretKey, coreCryptoNewKeyId, 32);
-    // If we dont retreive any key, we throw an error
-    // This should not happen since we generate a new key if it does not exist
     if (!keyNew || !keyOld) {
+        // If we dont retreive any key, we throw an error
+        // This should not happen since we generate a new key if it does not exist
         throw new Error('Key not found and could not be generated');
     }
     /**
-     * If the old key is freshly generated we dont need to migrate and return the new key
-     * If the old key exists and the new key is freshly generated, we need to migrate and then return the new key (This should only happen once !!!!)
-     * If the old key exists and the new key exists we return the new key
+     * Handles migration and cleanup of encryption keys.
+     *
+     * - If `keyNew` is freshly generated and `keyOld` is not freshly generated:
+     *     - Migrate data from `keyOld` to `keyNew`
      */
-    if (!keyOld.freshlyGenerated && keyNew.freshlyGenerated) {
-        // Create the new key in the format used by coreCrypto
+    if (keyNew.freshlyGenerated && !keyOld.freshlyGenerated) {
         const databaseKey = new core_crypto_1.DatabaseKey(keyNew.key);
-        // Run the migration
         await (0, core_crypto_1.migrateDatabaseKeyTypeToBytes)(coreCryptoDbName, bazinga64_1.Encoder.toBase64(keyOld.key).asString, databaseKey);
-        // delete the old key, it will be freshly generated in the next call and ensure we dont run the migration again
-        await keyOld.deleteKey();
     }
+    // Always clean up the old key
+    await keyOld.deleteKey();
     return {
         key: new core_crypto_1.DatabaseKey(keyNew.key),
         deleteKey: keyNew.deleteKey,

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

@@ -559,7 +559,7 @@ describe('ProteusService', () => {
             id: '',
             type: conversation_1.CONVERSATION_TYPE.REGULAR,
             creator: '',
-            cells_state: 'disabled',
+            cells_state: conversation_1.CONVERSATION_CELLS_STATE.DISABLED,
             access: [],
             access_role: [conversation_1.CONVERSATION_ACCESS_ROLE.GUEST],
             members: {

package/package.json

@@ -11,7 +11,7 @@
     "./lib/cryptography/AssetCryptography/crypto.node": "./lib/cryptography/AssetCryptography/crypto.browser.js"
   },
   "dependencies": {
-    "@wireapp/api-client": "^27.64.0",
+    "@wireapp/api-client": "^27.65.0",
     "@wireapp/commons": "^5.4.2",
     "@wireapp/core-crypto": "7.0.1",
     "@wireapp/cryptobox": "12.8.0",
@@ -61,6 +61,6 @@
     "test:coverage": "jest --coverage",
     "watch": "tsc --watch"
   },
-  "version": "46.28.0",
-  "gitHead": "ce17f11c034dd96498c9e8a6a7da16044e669ff6"
+  "version": "46.29.1",
+  "gitHead": "6b802b2fef0ce58ce62913bc808297670aa3013d"
 }