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
web: fix app lock not getting disabled
Abdullah Attabd93048aaa83
diff --git a/apps/web/src/interfaces/key-store.ts b/apps/web/src/interfaces/key-store.tsindex b2de1ae32..c24da5252 100644--- a/apps/web/src/interfaces/key-store.ts+++ b/apps/web/src/interfaces/key-store.ts@@ -113,10 +113,7 @@ class KeyStore {);await this.metadataStore.delete(this.keyId);- await this.metadataStore.set<SerializableCredential[]>("credentials", [- ...(await this.getCredentials()),- { id: credential.id, type: credential.type }- ]);+ await this.setCredential({ id: credential.id, type: credential.type });this.key = originalKey;return this;@@ -128,7 +125,7 @@ class KeyStore {permanent?: boolean;}) {- if (!(await this.isLocked())) return this;+ if (!(await this.hasCredential(credential))) return;const encryptedKey = await this.metadataStore.get<Cipher<"base64"> | EncryptedData@@ -147,9 +144,7 @@ class KeyStore {);if (options?.permanent) {- for (const credential of await this.getCredentials()) {- await this.metadataStore.delete(this.getCredentialKey(credential));- }+ await this.resetCredentials();await this.storeKey(key);this.key = undefined;} else this.key = key;@@ -228,6 +223,31 @@ class KeyStore {);}+ public async hasCredential(credential: SerializableCredential) {+ const credentials = await this.getCredentials();+ const index = credentials.findIndex(+ (c) => c.type === credential.type && c.id === credential.id+ );+ return index > -1;+ }++ public async resetCredentials() {+ for (const credential of await this.getCredentials()) {+ await this.metadataStore.delete(this.getCredentialKey(credential));+ }+ await this.metadataStore.delete("credentials");+ }++ public async setCredential(credential: SerializableCredential) {+ const credentials = await this.getCredentials();+ const index = credentials.findIndex(+ (c) => c.type === credential.type && c.id === credential.id+ );+ if (index > -1) return;+ credentials.push(credential);+ await this.metadataStore.set("credentials", credentials);+ }+public async set(name: string, value: string) {if (await this.isLocked())throw new Error("Please unlock the key store to set values.");diff --git a/apps/web/src/views/app-lock.tsx b/apps/web/src/views/app-lock.tsxindex 28383426d..a5d439ea5 100644--- a/apps/web/src/views/app-lock.tsx+++ b/apps/web/src/views/app-lock.tsx@@ -83,7 +83,8 @@ export default function AppLock(props: PropsWithChildren<unknown>) {alignItems: "center",justifyContent: "center",height: "100%",- flexDirection: "column"+ flexDirection: "column",+ overflowY: "auto"}}onSubmit={async (e) => {e.preventDefault();