Skip to content

A fully open source & end-to-end encrypted note taking alternative to Evernote.

core: fix `getInboxKeys`

Abdullah Atta6a843a6457f1
diff --git a/packages/core/src/api/user-manager.ts b/packages/core/src/api/user-manager.ts
index 4ee284a8c..a884d37c1 100644
--- a/packages/core/src/api/user-manager.ts
+++ b/packages/core/src/api/user-manager.ts
@@ -500,35 +500,9 @@ class UserManager {
}
async getInboxKeys() {
- return this.getUserKey<SerializedKeyPair>({
- getCache: () => this.cachedInboxKeys,
- setCache: (key) => {
- this.cachedInboxKeys = key;
- },
- userProperty: "inboxKeys",
+ return this.getUserKey("inboxKeys", {
generateKey: () => this.db.crypto().generatePGPKeyPair(),
- errorContext: "inbox encryption keys",
- encrypt: async (keys, userEncryptionKey) => {
- const encryptedPrivateKey = await this.db
- .storage()
- .encrypt(userEncryptionKey, JSON.stringify(keys.privateKey));
- return {
- inboxKeys: {
- public: keys.publicKey,
- private: encryptedPrivateKey
- }
- };
- },
- decrypt: async (user, userEncryptionKey) => {
- if (!user.inboxKeys) throw new Error("Inbox keys not found");
- const decryptedPrivateKey = await this.db
- .storage()
- .decrypt(userEncryptionKey, user.inboxKeys.private);
- return {
- publicKey: user.inboxKeys.public,
- privateKey: JSON.parse(decryptedPrivateKey)
- };
- }
+ errorContext: "inbox encryption keys"
});
}
@@ -556,9 +530,7 @@ class UserManager {
}
async saveInboxKeys(keys: SerializedKeyPair) {
- this.cachedInboxKeys = keys;
-
- const userEncryptionKey = await this.getEncryptionKey();
+ const userEncryptionKey = await this.getMasterKey();
if (!userEncryptionKey) return;
const updatePayload = {