A fully open source & end-to-end encrypted note taking alternative to Evernote.
TypeScript asp-net-coredotnet-coreelectronfosshacktoberfestnote-managmentnote-takingnote-taking-appnotebooknotesnotes-appopen-sourceopensourceprivacyproductivityreactreact-nativereactjsself-hosted
Merge branch 'master' into beta
Ammar Ahmedc52779df2338
diff --cc packages/core/src/api/sync/collector.tsindex 641526593,ca2ffe590..31544780e--- a/packages/core/src/api/sync/collector.ts+++ b/packages/core/src/api/sync/collector.ts@@@ -47,9 -46,9 +47,9 @@@ class CollectorchunkSize: number,isForceSync = false): AsyncGenerator<SyncTransferItem, void, unknown> {- const key = await this.db.user.getEncryptionKey();- if (!key || !key.key || !key.salt) {+ const keys = await this.db.user.getDataEncryptionKeys();+ if (!keys || !keys.length) {- EV.publish(EVENTS.userSessionExpired);+ this.db.eventManager.publish(EVENTS.userSessionExpired);throw new Error("User encryption key not generated. Please relogin.");}diff --cc packages/core/src/api/sync/index.tsindex db47ab229,f35a89bd3..d0fef7eec--- a/packages/core/src/api/sync/index.ts+++ b/packages/core/src/api/sync/index.ts@@@ -512,15 -476,10 +513,15 @@@ export class Syncthis.connection.on("SendItems", async (chunk) => {if (this.connection?.state !== HubConnectionState.Connected) return false;- const key = await this.getKey();- if (!key) return false;-- await this.processChunk(chunk, key, options);+ const keys = await this.db.user.getDataEncryptionKeys();+ if (!keys || !keys.length) {+ this.logger.error(+ new Error("User encryption keys not generated. Please relogin.")+ );- EV.publish(EVENTS.userSessionExpired);++ this.db.eventManager.publish(EVENTS.userSessionExpired);+ return false;+ }+ await this.processChunk(chunk, keys, options);sendSyncProgressEvent(this.db.eventManager, `download`, chunk.count);diff --cc packages/core/src/api/user-manager.tsindex 4f098eeca,0ae623e17..bedb2e0b2--- a/packages/core/src/api/user-manager.ts+++ b/packages/core/src/api/user-manager.ts@@@ -49,10 -42,11 +49,10 @@@ const ENDPOINTS =class UserManager {private tokenManager: TokenManager;- private cachedAttachmentKey?: SerializedKey;- private cachedMonographPasswordsKey?: SerializedKey;- private cachedInboxKeys?: SerializedKeyPair;+ private keyManager: KeyManager;constructor(private readonly db: Database) {- this.tokenManager = new TokenManager(db.kv);+ this.keyManager = new KeyManager(db);+ this.tokenManager = new TokenManager(db.kv, db.eventManager);EV.subscribe(EVENTS.userUnauthorized, async (url: string) => {if (url.includes("/connect/token") || !(await HealthCheck.auth())) return;